address class enhanced, hostel class fixed