Changes for simplification of naming + caching + groupby functionality
Changes for simplification of naming + caching + groupby functionality