diff --git a/src/scripts/classes/handiwork/animation.ts b/src/scripts/classes/handiwork/animation.ts
index 873c054..4d6a19b 100644
--- a/src/scripts/classes/handiwork/animation.ts
+++ b/src/scripts/classes/handiwork/animation.ts
@@ -1,9 +1,9 @@
 "use strict";
 
 // Modules from files
-import { IAuthor, AnimationI, IRating } from "../../interfaces";
+import { AuthorType, IAnimation, RatingType, CategoryType } from "../../interfaces";
 
-export default class Animation implements AnimationI {
+export default class Animation implements IAnimation {
     
     //#region Properties
     Censored: boolean;
@@ -13,8 +13,8 @@ export default class Animation implements AnimationI {
     Lenght: string;
     Pages: string;
     Resolution: string[];
-    Authors: IAuthor[];
-    Category: string;
+    Authors: AuthorType[];
+    Category: CategoryType;
     Changelog: string[];
     Cover: string;
     ID: number;
@@ -22,7 +22,7 @@ export default class Animation implements AnimationI {
     Name: string;
     Overview: string;
     Prefixes: string[];
-    Rating: IRating;
+    Rating: RatingType;
     Tags: string[];
     ThreadPublishingDate: Date;
     Url: string;
diff --git a/src/scripts/classes/handiwork/asset.ts b/src/scripts/classes/handiwork/asset.ts
index 9c0053c..f9fa969 100644
--- a/src/scripts/classes/handiwork/asset.ts
+++ b/src/scripts/classes/handiwork/asset.ts
@@ -1,9 +1,9 @@
 "use strict";
 
 // Modules from files
-import { IAuthor, AssetI, IRating } from "../../interfaces";
+import { AuthorType, IAsset, RatingType, CategoryType } from "../../interfaces";
 
-export default class Asset implements AssetI {
+export default class Asset implements IAsset {
 
     //#region Properties
     AssetLink: string;
@@ -12,8 +12,8 @@ export default class Asset implements AssetI {
     IncludedAssets: string[];
     OfficialLinks: string[];
     SKU: string;
-    Authors: IAuthor[];
-    Category: string;
+    Authors: AuthorType[];
+    Category: CategoryType;
     Changelog: string[];
     Cover: string;
     ID: number;
@@ -21,7 +21,7 @@ export default class Asset implements AssetI {
     Name: string;
     Overview: string;
     Prefixes: string[];
-    Rating: IRating;
+    Rating: RatingType;
     Tags: string[];
     ThreadPublishingDate: Date;
     Url: string;
diff --git a/src/scripts/classes/handiwork/comic.ts b/src/scripts/classes/handiwork/comic.ts
index 766d26d..f507593 100644
--- a/src/scripts/classes/handiwork/comic.ts
+++ b/src/scripts/classes/handiwork/comic.ts
@@ -1,16 +1,16 @@
 "use strict";
 
 // Modules from files
-import { IAuthor, ComicI, IRating } from "../../interfaces";
+import { AuthorType, IComic, RatingType, CategoryType } from "../../interfaces";
 
-export default class Comic implements ComicI {
+export default class Comic implements IComic {
     
     //#region Properties
     Genre: string[];
     Pages: string;
     Resolution: string[];
-    Authors: IAuthor[];
-    Category: string;
+    Authors: AuthorType[];
+    Category: CategoryType;
     Changelog: string[];
     Cover: string;
     ID: number;
@@ -18,7 +18,7 @@ export default class Comic implements ComicI {
     Name: string;
     Overview: string;
     Prefixes: string[];
-    Rating: IRating;
+    Rating: RatingType;
     Tags: string[];
     ThreadPublishingDate: Date;
     Url: string;
diff --git a/src/scripts/classes/handiwork/game.ts b/src/scripts/classes/handiwork/game.ts
index 818d62f..ac837c4 100644
--- a/src/scripts/classes/handiwork/game.ts
+++ b/src/scripts/classes/handiwork/game.ts
@@ -1,10 +1,10 @@
 "use strict";
 
 // Modules from files
-import { IAuthor, GameI, IRating } from "../../interfaces";
-
-export default class Game implements GameI {
+import { AuthorType, EngineType, IGame, RatingType, StatusType, CategoryType } from "../../interfaces";
 
+export default class Game implements IGame {
+    
     //#region Properties
     Censored: boolean;
     Genre: string[];
@@ -13,8 +13,8 @@ export default class Game implements GameI {
     LastRelease: Date;
     OS: string[];
     Version: string;
-    Authors: IAuthor[];
-    Category: string;
+    Authors: AuthorType[];
+    Category: CategoryType;
     Changelog: string[];
     Cover: string;
     ID: number;
@@ -22,10 +22,13 @@ export default class Game implements GameI {
     Name: string;
     Overview: string;
     Prefixes: string[];
-    Rating: IRating;
+    Rating: RatingType;
     Tags: string[];
     ThreadPublishingDate: Date;
     Url: string;
+    Engine: EngineType;
+    Mod: boolean;
+    Status: StatusType;
     //#endregion Properties
 
 }
\ No newline at end of file
diff --git a/src/scripts/classes/handiwork/handiwork.ts b/src/scripts/classes/handiwork/handiwork.ts
index 9444b5d..f683633 100644
--- a/src/scripts/classes/handiwork/handiwork.ts
+++ b/src/scripts/classes/handiwork/handiwork.ts
@@ -1,7 +1,7 @@
 "use strict";
 
 // Modules from files
-import { IAuthor, IRating, IHandiwork } from "../../interfaces";
+import { AuthorType, RatingType, IHandiwork , EngineType, CategoryType, StatusType} from "../../interfaces";
 
 /**
  * It represents a generic work, be it a game, a comic, an animation or an asset.
@@ -27,18 +27,21 @@ export default class HandiWork implements IHandiwork {
     Resolution: string[];
     SKU: string;
     Version: string;
-    Authors: IAuthor[];
-    Category: string;
+    Authors: AuthorType[];
+    Category: CategoryType;
     Cover: string;
     ID: number;
     LastThreadUpdate: Date;
     Name: string;
     Overview: string;
     Prefixes: string[];
-    Rating: IRating;
+    Rating: RatingType;
     Tags: string[];
     ThreadPublishingDate: Date;
     Url: string;
+    Engine: EngineType;
+    Mod: boolean;
+    Status: StatusType;
     //#endregion Properties
 
 }
\ No newline at end of file