Add building & room to class