2015-2Q: SIMPLer: Enhancements to Templates