Update notes for submitted changes

* Add a base class for pluggable functions
Update notes for submitted changes

* Refactor re-resolving of templates