Container class added
Adjusted to use ListenerContainer class