Improve spider toolkit