Change Selection Options to statefull