diff --git a/circle.yml b/circle.yml
index 146a171107..3877f51be8 100644
--- a/circle.yml
+++ b/circle.yml
@@ -16,6 +16,7 @@ dependencies:
 test:
   override:
     - yarn run ci
+    - yarn run example:build:prod
     - yarn run example:test -- --watch=false
 
 deployment:
diff --git a/modules/entity/src/entity_state.ts b/modules/entity/src/entity_state.ts
index 2f86ed2b62..aab8653b49 100644
--- a/modules/entity/src/entity_state.ts
+++ b/modules/entity/src/entity_state.ts
@@ -1,4 +1,4 @@
-import { EntityState, EntityStateStr, EntityStateNum } from './models';
+import { EntityState } from './models';
 
 export function getInitialEntityState<V>(): EntityState<V> {
   return {
diff --git a/modules/entity/src/models.ts b/modules/entity/src/models.ts
index c9656b41fa..d1ba0692b9 100644
--- a/modules/entity/src/models.ts
+++ b/modules/entity/src/models.ts
@@ -18,15 +18,13 @@ export type IdSelectorNum<T> = {
 
 export type IdSelector<T> = IdSelectorStr<T> | IdSelectorNum<T>;
 
-export type DictionaryStr<T> = {
-  [id: string]: T;
-};
-
 export type DictionaryNum<T> = {
   [id: number]: T;
 };
 
-export type Dictionary<T> = DictionaryStr<T> | DictionaryNum<T>;
+export abstract class Dictionary<T> implements DictionaryNum<T> {
+  [id: string]: T;
+}
 
 export type UpdateStr<T> = {
   id: string;
@@ -40,18 +38,11 @@ export type UpdateNum<T> = {
 
 export type Update<T> = UpdateStr<T> | UpdateNum<T>;
 
-export interface EntityStateStr<T> {
-  ids: string[];
+export interface EntityState<T> {
+  ids: any[];
   entities: Dictionary<T>;
 }
 
-export interface EntityStateNum<T> {
-  ids: number[];
-  entities: Dictionary<T>;
-}
-
-export type EntityState<T> = EntityStateStr<T> | EntityStateNum<T>;
-
 export interface EntityDefinition<T> {
   selectId: IdSelector<T>;
   sortComparer: false | Comparer<T>;
diff --git a/package.json b/package.json
index d453d147a6..9e0cbd9390 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "example:start": "yarn run build && yarn run cli -- serve",
     "example:start:aot": "yarn run build && yarn run cli -- serve --aot",
     "example:test": "jest --watch",
-    "example:build:prod": "yarn build && yarn cli -- build --aot -prod --base-href \"/platform/example-app/\" --output-path \"./example-dist/example-app\"",
+    "example:build:prod": "yarn build && yarn cli -- build -prod --base-href \"/platform/example-app/\" --output-path \"./example-dist/example-app\"",
     "ci": "yarn run build && yarn run test && nyc report --reporter=text-lcov | coveralls",
     "prettier": "prettier --parser typescript --single-quote --trailing-comma es5 --write \"./**/*.ts\"",
     "watch:tests": "chokidar 'modules/**/*.ts' --initial -c 'nyc --reporter=text --reporter=html yarn run test:unit'",