Adding Scraper and Tracer