Added validation to options