Updated merge with requested changes, some changes to import/export