Added pagination solution.