Updates for new export form