Crawler improvement and adding chart generation