BaseBuilding 1.2 Improvements