diff --git a/modules/aggregation-layers/src/aggregation-layer.ts b/modules/aggregation-layers/src/aggregation-layer.ts
index fe223015bfe..65930d676e6 100644
--- a/modules/aggregation-layers/src/aggregation-layer.ts
+++ b/modules/aggregation-layers/src/aggregation-layer.ts
@@ -24,7 +24,8 @@ import {
   LayerDataSource,
   _compareProps as compareProps,
   UpdateParameters,
-  CompositeLayerProps
+  CompositeLayerProps,
+  Attribute
 } from '@deck.gl/core';
 import {filterProps} from './utils/prop-utils';
 
@@ -75,7 +76,7 @@ export default abstract class AggregationLayer<
     this.setState({changedAttributes});
   }
 
-  getAttributes() {
+  getAttributes(): {[id: string]: Attribute} {
     return this.getAttributeManager()!.getAttributes();
   }
 
diff --git a/modules/core/src/index.ts b/modules/core/src/index.ts
index 1092a5d2a64..73af0dc997a 100644
--- a/modules/core/src/index.ts
+++ b/modules/core/src/index.ts
@@ -45,6 +45,7 @@ export {default as _PickLayersPass} from './passes/pick-layers-pass';
 export {default as Deck} from './lib/deck';
 
 export {default as LayerManager} from './lib/layer-manager';
+export {default as Attribute} from './lib/attribute/attribute';
 export {default as AttributeManager} from './lib/attribute/attribute-manager';
 export {default as Layer} from './lib/layer';
 export {default as CompositeLayer} from './lib/composite-layer';
diff --git a/modules/main/src/index.ts b/modules/main/src/index.ts
index 467ed93450f..d0b33509830 100644
--- a/modules/main/src/index.ts
+++ b/modules/main/src/index.ts
@@ -56,6 +56,7 @@ export {
   OrthographicController,
   _GlobeController,
   // For custom layers
+  Attribute,
   AttributeManager,
   // Shader modules
   picking,