Modifications to template