diff --git a/src/app.module.ts b/src/app.module.ts
index e7fc8bb..64b27f2 100644
--- a/src/app.module.ts
+++ b/src/app.module.ts
@@ -2,15 +2,10 @@ import { Module } from '@nestjs/common';
 import { AppController } from './app.controller';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { MerchantsModule } from './merchants/merchants.module';
-import { Merchant } from './merchants/entities/merchant.entity';
 import { TagsModule } from './tags/tags.module';
-import { Tag } from './tags/entities/tag.entity';
 import { CategoriesModule } from './categories/categories.module';
-import { Category } from './categories/entities/category.entity';
 import { SubCategoriesModule } from './sub-categories/sub-categories.module';
-import { SubCategory } from './sub-categories/entities/sub-category.entity';
 import { ExpensesModule } from './expenses/expenses.module';
-import { Expense } from './expenses/entities/expense.entity';
 
 @Module({
   imports: [
@@ -22,7 +17,7 @@ import { Expense } from './expenses/entities/expense.entity';
       username: 'common-cents',
       password: 'CommonCents_123!',
       database: 'common-cents',
-      entities: [Merchant, Tag, Category, SubCategory, Expense]
+      autoLoadEntities: true
     }),
     MerchantsModule,
     TagsModule,
diff --git a/src/categories/categories.module.ts b/src/categories/categories.module.ts
index 13c65db..96cd196 100644
--- a/src/categories/categories.module.ts
+++ b/src/categories/categories.module.ts
@@ -2,9 +2,13 @@ import { Module } from '@nestjs/common';
 import { CategoriesService } from './categories.service';
 import { CategoriesController } from './categories.controller';
 import { CategoryDataService } from './category-data.service';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { Category } from './entities/category.entity';
 
 @Module({
   controllers: [CategoriesController],
-  providers: [CategoriesService, CategoryDataService]
+  providers: [CategoriesService, CategoryDataService],
+  imports: [TypeOrmModule.forFeature([Category])],
+  exports: [TypeOrmModule]
 })
 export class CategoriesModule { }
diff --git a/src/expenses/expenses.module.ts b/src/expenses/expenses.module.ts
index 2179916..004fcb7 100644
--- a/src/expenses/expenses.module.ts
+++ b/src/expenses/expenses.module.ts
@@ -2,9 +2,13 @@ import { Module } from '@nestjs/common';
 import { ExpensesService } from './expenses.service';
 import { ExpensesController } from './expenses.controller';
 import { ExpenseDataService } from './expense-data.service';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { Expense } from './entities/expense.entity';
 
 @Module({
   controllers: [ExpensesController],
   providers: [ExpensesService, ExpenseDataService],
+  imports: [TypeOrmModule.forFeature([Expense])],
+  exports: [TypeOrmModule]
 })
 export class ExpensesModule { }
diff --git a/src/merchants/merchants.module.ts b/src/merchants/merchants.module.ts
index ffb8ca0..c2e3ff5 100644
--- a/src/merchants/merchants.module.ts
+++ b/src/merchants/merchants.module.ts
@@ -2,9 +2,13 @@ import { Module } from '@nestjs/common';
 import { MerchantsService } from './merchants.service';
 import { MerchantsController } from './merchants.controller';
 import { MerchantDataService } from './merchant-data.service';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { Merchant } from './entities/merchant.entity';
 
 @Module({
   controllers: [MerchantsController],
-  providers: [MerchantsService, MerchantDataService]
+  providers: [MerchantsService, MerchantDataService],
+  imports: [TypeOrmModule.forFeature([Merchant])],
+  exports: [TypeOrmModule]
 })
 export class MerchantsModule { }
diff --git a/src/sub-categories/sub-categories.module.ts b/src/sub-categories/sub-categories.module.ts
index f47230a..7374dec 100644
--- a/src/sub-categories/sub-categories.module.ts
+++ b/src/sub-categories/sub-categories.module.ts
@@ -2,9 +2,13 @@ import { Module } from '@nestjs/common';
 import { SubCategoriesService } from './sub-categories.service';
 import { SubCategoriesController } from './sub-categories.controller';
 import { SubCategoryDataService } from './sub-category-data.service';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { SubCategory } from './entities/sub-category.entity';
 
 @Module({
   controllers: [SubCategoriesController],
-  providers: [SubCategoriesService, SubCategoryDataService]
+  providers: [SubCategoriesService, SubCategoryDataService],
+  imports: [TypeOrmModule.forFeature([SubCategory])],
+  exports: [TypeOrmModule]
 })
 export class SubCategoriesModule { }
diff --git a/src/tags/tags.module.ts b/src/tags/tags.module.ts
index 5f4c074..7bf687d 100644
--- a/src/tags/tags.module.ts
+++ b/src/tags/tags.module.ts
@@ -2,9 +2,13 @@ import { Module } from '@nestjs/common';
 import { TagsService } from './tags.service';
 import { TagsController } from './tags.controller';
 import { TagDataService } from './tag-data.service';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { Tag } from './entities/tag.entity';
 
 @Module({
   controllers: [TagsController],
-  providers: [TagsService, TagDataService]
+  providers: [TagsService, TagDataService],
+  imports: [TypeOrmModule.forFeature([Tag])],
+  exports: [TypeOrmModule]
 })
 export class TagsModule { }