Improve Export/Import