Added filling Rooms and Buildings