Added support for multiple listeners