Add autoloader entries for aggregation classes

Change-Id: Ie4dca27d338cdafb06cc2f3d60e76e668a29c660