Better handling of export options.