diff --git a/apps/demo/src/app/state/entity-metadata.ts b/apps/demo/src/app/state/entity-metadata.ts
deleted file mode 100644
index 8e5b2d153..000000000
--- a/apps/demo/src/app/state/entity-metadata.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { EntityMetadataMap, EntityDataModuleConfig } from '@ngrx/data';
-
-const entityMetadata: EntityMetadataMap = {};
-
-const pluralNames = {};
-
-export const entityConfig: EntityDataModuleConfig = {
-  entityMetadata,
-  pluralNames
-};
diff --git a/components/demo-firebase/src/lib/models/guestbook/guestbook.ts b/components/demo-firebase/src/lib/models/guestbook/guestbook.ts
index 484847258..1b1868fe3 100644
--- a/components/demo-firebase/src/lib/models/guestbook/guestbook.ts
+++ b/components/demo-firebase/src/lib/models/guestbook/guestbook.ts
@@ -38,8 +38,6 @@ export type GuestbookRoles = 'admin' | GrantedReadRole;
 
 export type GuestbookWithId = DocumentDataWithId<Guestbook>;
 
-export type GuestbookRef = DocumentReferenceRef<Guestbook>;
-
 export class GuestbookDocument extends AbstractFirestoreDocument<Guestbook, GuestbookDocument> {
   get modelIdentity() {
     return guestbookIdentity;
@@ -98,8 +96,6 @@ export interface GuestbookEntry extends UserRelatedById {
 
 export type GuestbookEntryRoles = 'owner' | GrantedReadRole;
 
-export type GuestbookEntryRef = DocumentReferenceRef<GuestbookEntry>;
-
 export class GuestbookEntryDocument extends AbstractFirestoreDocumentWithParent<Guestbook, GuestbookEntry, GuestbookEntryDocument> {
   get modelIdentity() {
     return guestbookEntryIdentity;
diff --git a/components/demo-firebase/src/lib/models/profile/profile.ts b/components/demo-firebase/src/lib/models/profile/profile.ts
index f06d24471..5479f600b 100644
--- a/components/demo-firebase/src/lib/models/profile/profile.ts
+++ b/components/demo-firebase/src/lib/models/profile/profile.ts
@@ -30,8 +30,6 @@ export interface Profile extends UserRelatedById {
 
 export type ProfileRoles = 'owner' | GrantedReadRole;
 
-export type ProfileRef = DocumentReferenceRef<Profile>;
-
 export class ProfileDocument extends AbstractFirestoreDocument<Profile, ProfileDocument> {
   get modelIdentity() {
     return profileIdentity;
@@ -75,8 +73,6 @@ export interface ProfilePrivateData {
   createdAt: Date;
 }
 
-export type ProfilePrivateDataRef = DocumentReferenceRef<ProfilePrivateData>;
-
 export type ProfilePrivateDataRoles = 'owner' | GrantedReadRole;
 
 export class ProfilePrivateDataDocument extends AbstractFirestoreDocument<ProfilePrivateData, ProfilePrivateDataDocument> {
diff --git a/packages/firebase-server/src/lib/nest/model/index.ts b/packages/firebase-server/src/lib/nest/model/index.ts
index 12e8fadfc..e2cde9957 100644
--- a/packages/firebase-server/src/lib/nest/model/index.ts
+++ b/packages/firebase-server/src/lib/nest/model/index.ts
@@ -1,3 +1,4 @@
+export * from './model.param';
 export * from './permission.error';
 export * from './create.model.function';
 export * from './update.model.function';
diff --git a/packages/firebase-server/src/lib/nest/model/model.param.ts b/packages/firebase-server/src/lib/nest/model/model.param.ts
new file mode 100644
index 000000000..397238383
--- /dev/null
+++ b/packages/firebase-server/src/lib/nest/model/model.param.ts
@@ -0,0 +1,12 @@
+import { FirestoreModelKey, FirestoreModelKeyRef } from '@dereekb/firebase';
+import { Expose } from 'class-transformer';
+import { IsString } from 'class-validator';
+
+/**
+ * Simple annotated params that
+ */
+export class TargetModelParams implements FirestoreModelKeyRef {
+  @Expose()
+  @IsString()
+  key!: FirestoreModelKey;
+}
diff --git a/setup/setup-project.sh b/setup/setup-project.sh
index 114bffd31..c98c1990c 100755
--- a/setup/setup-project.sh
+++ b/setup/setup-project.sh
@@ -217,7 +217,7 @@ git commit --no-verify -m "checkpoint: added firebase configuration"
 
 # Install npm dependencies
 npm install @dereekb/dbx-analytics$DBX_COMPONENTS_VERSION @dereekb/dbx-web$DBX_COMPONENTS_VERSION @dereekb/dbx-form$DBX_COMPONENTS_VERSION @dereekb/firebase$DBX_COMPONENTS_VERSION @dereekb/firebase-server$DBX_COMPONENTS_VERSION @dereekb/dbx-firebase$DBX_COMPONENTS_VERSION --force  # TODO: Remove force once possible.
-npm install -D firebase-tools @ngrx/store-devtools @firebase/rules-unit-testing firebase-functions-test@2.0.2 envfile
+npm install -D firebase-tools @ngrx/store-devtools @firebase/rules-unit-testing firebase-functions-test@2.0.2 envfile env-cmd
 
 git add --all
 git commit --no-verify -m "checkpoint: added @dereekb dependencies"
@@ -533,7 +533,6 @@ download_angular_ts_file "src/app/container/layout.component.ts"
 
 mkdir $ANGULAR_APP_FOLDER/src/app/state
 download_angular_ts_file "src/app/state/app.state.ts"
-download_angular_ts_file "src/app/state/entity-metadata.ts"
 
 mkdir $ANGULAR_APP_FOLDER/src/app/modules
 mkdir $ANGULAR_APP_FOLDER/src/app/modules/app
diff --git a/setup/templates/apps/app/src/app/state/entity-metadata.ts b/setup/templates/apps/app/src/app/state/entity-metadata.ts
deleted file mode 100644
index c35e88e68..000000000
--- a/setup/templates/apps/app/src/app/state/entity-metadata.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { EntityMetadataMap, EntityDataModuleConfig } from '@ngrx/data';
-
-const entityMetadata: EntityMetadataMap = {};
-
-const pluralNames = {  };
-
-export const entityConfig: EntityDataModuleConfig = {
-  entityMetadata,
-  pluralNames
-};