Better handling to add groups