Added the new tabs and data template changes for export