Added listener support