added user and groups entities