Changing Fetcher <-> Requester structure