Change Fetcher class to use the new Song class