Added basic validation support