Added some validation to option classes