Improve the crawler part