Use event afterExec instead of change