Add Needle Validation Features