Added overrideOptions field