Added more fields to scrape