Added support for paginated charges