Add option extraction and validation.