Adjusted rooms service to use new system