Updating overrides to reflect new JSON structure
Using lenses in pagination to ensure nested tokens can be accessed without accessor exports