Added simple validation support