Using adapters instead of including everything on fetcher