Clean up repeat code by using already implemented AbstractListenerAggregate