Update notes for submitted changes

* Factor out the on_failure to a mixin type