Refactor the spider
Add more options for runner