Add more instance variables and getters/setters; allow for null scraper (helps testing)