Fix exports
Merge branch 'feature/fix_export'