Added basic support for exporting