Added DDPP templates + Misc Template Updates