Templates fix

* Added new pwf api to some modules