Improve dataexports