Add grouping for file loading