Use the new listener, simplify config