Custom user and group entity class

Wait before merge, I prefer if you test my edit :)