Small changes on Group and User classes