added: first part for new data scraper handling