BuildingKit service classes modification