Enhanced templates