[OptionsResolver] Merged Options class into OptionsResolver