Added validation support