Revert "Revert "Added exporting""

This reverts commit 82398a04863bc7443f5ac8147183beae5e76a901.