Make import options a little better