Added StateOption interface