Add Options and OptionsParser classes