Fix API calls for spider
Updated TODO dependency
Fix API calls for scan