Updated wrapper
Adding support for pagination