Add better listener support.