Updated User entity with UserGroup dependency