Update notes for submitted changes

* Code improvement in plan datamodel