changed options structure