Minor additions for pagination support.