Added room handling