Added room support