Change to wildcard listeners