Add OptionSet to resolve options
Little modify
Global options can pass to children correctly.