Update notes for submitted changes

* Rewriting remaining handlers to objects