Add export; untested import; make work in workbench