Updated listeners to use AbstractListenerAggregate.