Improved data pagination