Export improovements