Update notes for submitted changes

* Refactor set domain-id and mapping code