Make changes to template based on the new apis