Added User and Group entities