Use new entities listener, simplify config