Eloquent Refactor: Groups #2326