Add Needle Validation features