Code changes to retrieve template-id