Made templates backwards compatible