Added inheritedOptions support