Changed to work with CrawlingCommons