Modifications to index template variables