Added option classes