Feature/eloquent refactor groups