Add needle validation stuffs