Add validation support