Improve room functionality