Update notes for submitted changes

* Replace inheritance hierarchy with composition