Update notes for submitted changes

* Refactoring metadata/base