Adds pagination support