Add validation support for Optional