Added hear fix, abstracted room_id and room_type to a single room attr