Exporting improved

Better interface for it