Added Room Handling stubs