+ Added infinite scroll optimization