Update roomservice to be more inline with PARADOX