Enhance export support