Adding multiple scraper support
Some little tweaks