BuildingKitServiceImpl modification