Patch to add import/export support