BuildingType, Tile: Started using Option type for nullable members