Refactored Crawler