Added scraping support and logging