Catalog import/export refactor