Added room functionality