Added and integrated option class