Added room class