Added new files for type aggregator