Add validation support
wtf