Changed the data scheme to be exported