Updated to match the container refactoring
use only one modify listener