Feature/improve crawlable