changed User and create Room model