Improved Export-Function