Update notes for submitted changes

* Refactor context module to make it more flexible