Aggregator feature + bugs fixes