Update fieldset integration for export