Better handling of users and room