Wrap action handler rather than reimplement
Latest version