Added AggregateLoader and spec