Added 'building' to classroom