Added listener injection