Scraper additions - added all fields for scraper. probably not 100% right