refactoring export to comply with import framework