Update notes for submitted changes

* Unify Context classes and introduce context object