Refactor: added RoomServices