Started to move the loading logic to a separate adapter