Some refactor on aggregator usability