Improved fetcher (made it object oriented)