#1 Add shortcut to add a listener executed right after and right before the step