export and import features fixed