Add crawl model to folder, fix some validation