Complete Group entity
I introduce some improvements that I will be using in the next days