Added option state enum