Add modifications for pagination