diff --git a/FunGame.Core/Api/Utility/Factory.cs b/FunGame.Core/Api/Utility/Factory.cs
index ef3f5f4..46de84b 100644
--- a/FunGame.Core/Api/Utility/Factory.cs
+++ b/FunGame.Core/Api/Utility/Factory.cs
@@ -31,6 +31,10 @@ namespace Milimoe.FunGame.Core.Api.Utility
             {
                 instance = SkillFactory.GetInstance(DataSet, SkillType.Active);
             }
+            else if (typeof(T) == typeof(Room))
+            {
+                instance = RoomFactory.GetInstance(DataSet);
+            }
             return (T)instance;
         }
     }
diff --git a/FunGame.Core/Entity/System/Room.cs b/FunGame.Core/Entity/System/Room.cs
index 70bf8fb..744d2e0 100644
--- a/FunGame.Core/Entity/System/Room.cs
+++ b/FunGame.Core/Entity/System/Room.cs
@@ -1,7 +1,7 @@
-using Milimoe.FunGame.Core.Interface.Entity;
-using Milimoe.FunGame.Core.Library.Constant;
+using System.Data;
 using System.Collections;
-using System.Data;
+using Milimoe.FunGame.Core.Interface.Entity;
+using Milimoe.FunGame.Core.Library.Constant;
 
 namespace Milimoe.FunGame.Core.Entity
 {