Cleaner way of handling lazy-loaded groups and data sources.