Add validity checker