ForgeObject refactoring