Improve crawling module