OnBefore and OnAfterAction setup changes