Add support for listeners