Adding handling of users and part of handling of the groups