Changes to improve crawling