Updates to Building/Room classes