Added support for removeListener