added room number and building support