Updated validation to use Option<string>