Removed type parameter from listeners