More controls for the crawler
Fixed merge conflict with branch crawler-control