Made OptionsParser container aware