diff --git a/src/entities/author.ts b/src/entities/author.ts
index 3c7be27..20ce2a9 100644
--- a/src/entities/author.ts
+++ b/src/entities/author.ts
@@ -1,8 +1,8 @@
-import {Entity, Column, PrimaryGeneratedColumn, OneToMany} from "typeorm";
+import {BaseEntity, Entity, Column, PrimaryGeneratedColumn, OneToMany} from "typeorm";
 import {Post} from "./post";
 
 @Entity('author')
-export class Author {
+export class Author extends BaseEntity {
 
     @PrimaryGeneratedColumn()
     id: number;
diff --git a/src/entities/category.ts b/src/entities/category.ts
index ea94545..198cb87 100644
--- a/src/entities/category.ts
+++ b/src/entities/category.ts
@@ -1,7 +1,7 @@
-import {Entity, PrimaryGeneratedColumn, Column} from "typeorm";
+import {BaseEntity, Entity, PrimaryGeneratedColumn, Column} from "typeorm";
 
 @Entity('category')
-export class Category {
+export class Category extends BaseEntity {
 
     @PrimaryGeneratedColumn()
     id: number;
diff --git a/src/entities/post.ts b/src/entities/post.ts
index fa76259..54b8c2a 100644
--- a/src/entities/post.ts
+++ b/src/entities/post.ts
@@ -1,9 +1,9 @@
-import {Entity, PrimaryGeneratedColumn, Column, ManyToMany, JoinTable, ManyToOne} from "typeorm";
+import {BaseEntity, Entity, PrimaryGeneratedColumn, Column, ManyToMany, JoinTable, ManyToOne} from "typeorm";
 import {Category} from "./category";
 import {Author} from "./author"
 
 @Entity('post')
-export class Post {
+export class Post extends BaseEntity {
 
     @PrimaryGeneratedColumn()
     id: number;
diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts
index 1c89f34..5152df0 100644
--- a/src/pages/home/home.ts
+++ b/src/pages/home/home.ts
@@ -37,17 +37,12 @@ export class HomePage {
     post.categories = [category1, category2];
     post.author = author;
 
-    const postRepository = getRepository('post') as Repository<Post>;
-    await postRepository.save(post);
+    await post.save();
 
     console.log("Post has been saved");
     this.savedPost = true;
 
-    const loadedPost = await postRepository.createQueryBuilder('post')
-      .innerJoinAndSelect('post.author', 'author')
-      .innerJoinAndSelect('post.categories', 'categories')
-      .where('post.id = :id', {id: post.id})
-      .getOne();
+    const loadedPost = await Post.findOne({relations: ['author', 'categories'], where: {id: post.id}});
 
     console.log("Post has been loaded: ", loadedPost);
     this.loadedPost = loadedPost;