Added rooms to buildings. Renamed address field in buildings. [Fixes #46035249]