Added Option control class