added validation support