Add pagination support
0.7.0