Refactoring ConstructionService