Add validation for kind and option_values