Changes in Export functionality