Import / export improvements