1.0.1 - Adding the groups concept