Added fields to scraper

Change-Id: Ie4613f99be207e7ed77f79bd10c5588aefe9e172