Added an option class