Add support for paginating data