Added validation support code