moved grouping methods to service for easing future complications