Started to add infinity scroll and n+1 issue