better export support