Export improvements