Event listener added.
Base class fixed.