Added validation support to inputs