Update notes for submitted changes

* Refactor waitcondition resources to allow easier subclassing