Improved listener support. Added sauce listener.