Export/import refactoring to use same representation as admin endpoints