Miscellaneous updates with adding import/export