User and Room features added