Re-adding template version