Crawler refactor