Improved listener list