Add event aggregator
Fix publish package