Added Room class