Speed up validation