Enhanced BuildingItemTypeBase and BuildingItem