diff --git a/.idea/runConfigurations/Keyset_ForUI.xml b/.idea/runConfigurations/Keyset_Augmented.xml
similarity index 86%
rename from .idea/runConfigurations/Keyset_ForUI.xml
rename to .idea/runConfigurations/Keyset_Augmented.xml
index 430327d84..b2ed7582c 100644
--- a/.idea/runConfigurations/Keyset_ForUI.xml
+++ b/.idea/runConfigurations/Keyset_Augmented.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Keyset ForUI" type="RubyRunConfigurationType" factoryName="Ruby" folderName="apps">
+  <configuration default="false" name="Keyset Augmented" type="RubyRunConfigurationType" factoryName="Ruby" folderName="apps">
     <module name="pagy" />
     <RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="" />
     <RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/gem/apps" />
@@ -25,7 +25,7 @@
     </EXTENSION>
     <EXTENSION ID="org.jetbrains.plugins.ruby.rails.run.RailsRunConfigurationExtension" SCRATCH_USE_RAILS_RUNNER="false" />
     <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/gem/bin/pagy" />
-    <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="keyset_for_ui.ru -p 8006 --no-install" />
+    <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="keyset_augmented.ru -p 8006 --no-install" />
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.rubocop.yml b/.rubocop.yml
index 096492273..311a15c27 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -69,7 +69,7 @@ Style/LambdaCall:
   Enabled: false
 
 
-# cannot inline the disabling in the file because rubocop complains anyway
+# Cannot inline the disabling in the file because rubocop complains anyway
 Style/RedundantInitialize:
   Exclude:
     - test/mock_helpers/arel.rb
@@ -78,7 +78,9 @@ Style/RedundantInitialize:
 Style/StringConcatenation:
   Enabled: false
 
-# these cops are disabled only in the test files in order to
+Style/Documentation:
+  Enabled: false
+# These cops are disabled only in the test files in order to
 # allow to copy and paste the failed output for test reconciliation
 Style/StringLiterals:
   Enabled: true
diff --git a/Gemfile.lock b/Gemfile.lock
index 9e98c7651..eaacd6ab8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,6 +2,7 @@ PATH
   remote: gem
   specs:
     pagy (9.3.3)
+      json
 
 GEM
   remote: https://rubygems.org/
@@ -154,7 +155,7 @@ GEM
     mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
     mutex_m (0.3.0)
-    net-imap (0.5.4)
+    net-imap (0.5.5)
       date
       net-protocol
     net-pop (0.1.2)
@@ -203,7 +204,8 @@ GEM
       base64 (>= 0.1.0)
       logger (>= 1.6.0)
       rack (>= 3.0.0, < 4)
-    rack-session (2.0.0)
+    rack-session (2.1.0)
+      base64 (>= 0.1.0)
       rack (>= 3.0.0)
     rack-test (2.2.0)
       rack (>= 1.3)
@@ -271,7 +273,7 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-packaging (0.5.2)
       rubocop (>= 1.33, < 2.0)
-    rubocop-performance (1.23.0)
+    rubocop-performance (1.23.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
@@ -315,7 +317,8 @@ GEM
     unicode-emoji (4.0.4)
     uri (1.0.2)
     useragent (0.16.11)
-    websocket-driver (0.7.6)
+    websocket-driver (0.7.7)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     zeitwerk (2.7.1)
diff --git a/docs/api/javascript/setup.md b/docs/api/javascript/setup.md
index 1bfa56f93..d903f3b69 100644
--- a/docs/api/javascript/setup.md
+++ b/docs/api/javascript/setup.md
@@ -8,7 +8,7 @@ order: 4
 
 !!!info Notice
 
-A javascript setup is required only for the `pagy*_js` helpers and the `pagy*_nav` for `Pagy::KeysetForUI` instances. Just using
+A javascript setup is required only for the `pagy*_js` helpers and the `pagy*_nav` for `Pagy::Keyset::Augmented` instances. Just using
 something like `anchor_string: 'data-remote="true"'` in any instances, works out of the box with any helper and without this
 setup.
 !!!
@@ -21,7 +21,7 @@ setup.
 
 ### How does it work?
 
-All the `pagy*_js` helpers, and the `pagy*_nav` for `Pagy::KeysetForUI` instances, complete their component on the
+All the `pagy*_js` helpers, and the `pagy*_nav` for `Pagy::Keyset::Augmented` instances, complete their component on the
 client side. The helper methods serves just a minimal HTML tag that contains a `data-pagy` attribute.
 
 Your app should [serve or bundle](#2-configure) a small [javascript file](#1-pick-a-javascript-file) and [run the `Pagy.init()
diff --git a/docs/api/keyset.md b/docs/api/keyset.md
index 27e81e643..54a42fb25 100644
--- a/docs/api/keyset.md
+++ b/docs/api/keyset.md
@@ -227,7 +227,7 @@ which naturally ends with the end of the `set`, so it doesn't have any `cutoff`
 - A `cutoff` identifies a "cutoff value", for a `page` in the `set`. It is not a record nor a reference to it.
 - Its value is derived from the `keyset attributes values` array of the last record of the `page`, converted to JSON, and encoded
   as a Base64 URL-safe string, for easy use in URLs.
-  - `Pagy::Keyset` embeds it in the request URL; `Pagy::KeysetForUI` caches it on the client `sessionStorage`.
+  - `Pagy::Keyset` embeds it in the request URL; `Pagy::Keyset::Augmented` caches it on the client `sessionStorage`.
 - All the `page`s but the last, end with the `cutoff`.
 - All the `page`s but the first, begin AFTER the `cutoff` of the previous `page`.
 
diff --git a/docs/api/keyset_for_ui.md b/docs/api/keyset_for_ui.md
index af2377dc7..7b56e159a 100644
--- a/docs/api/keyset_for_ui.md
+++ b/docs/api/keyset_for_ui.md
@@ -1,11 +1,11 @@
 ---
-title: Pagy::KeysetForUI
+title: Pagy::Keyset::Augmented
 category:
   - Feature
   - Class
 ---
 
-# Pagy::KeysetForUI
+# Pagy::Keyset::Augmented
 
 A [Pagy::Keyset](keyset.md) subclass supporting `pagy_*nav` and other Frontend helpers.
 
@@ -17,7 +17,7 @@ A [Pagy::Keyset](keyset.md) subclass supporting `pagy_*nav` and other Frontend h
 The regular `Pagy::Keyset` uses the fastest technique for SQL pagination, but it cannot work with any Frontend helper because they
 require a pagy object with numeric variables.
 
-That's why we created `Pagy::KeysetForUI`: it uses the fast keyset pagination AND supports `pagy_*navs` and other Frontend
+That's why we created `Pagy::Keyset::Augmented`: it uses the fast keyset pagination AND supports `pagy_*navs` and other Frontend
 helpers.
 
 !!!
@@ -45,7 +45,7 @@ The Keyset pagination for UI adds the numeric variables (`page`, `last`, `prev`,
 usage with most Frontend helpers. It does so by transparently exchanging data back and forth with the client, that stores the
 state of the pagination.
 
-You can use a `Pagy::KeysetForUI` object as you would with a standard `Pagy` (offset countless) object. You need just a different
+You can use a `Pagy::Keyset::Augmented` object as you would with a standard `Pagy` (offset countless) object. You need just a different
 setup and you will get a lot more performance.
 
 ==- In-depth: Understanding the data exchange
@@ -182,24 +182,24 @@ user by:
 
 ## ORMs
 
-`Pagy::KeysetForUI` implements the subclasses for `ActiveRecord::Relation` and `Sequel::Dataset` sets and instantiate them
+`Pagy::Keyset::Augmented` implements the subclasses for `ActiveRecord::Relation` and `Sequel::Dataset` sets and instantiate them
 internally:
 
 ```ruby
-Pagy::KeysetForUI.new(active_record_set)
-#=> #<Pagy::KeysetForUI::ActiveRecord:0x00000001066215e0>
+Pagy::Keyset::Augmented.new(active_record_set)
+#=> #<Pagy::Keyset::Augmented::ActiveRecord:0x00000001066215e0>
 
-Pagy::KeysetForUI.new(sequel_set)
-#=> #<Pagy::KeysetForUI::Sequel:0x00000001066545e0>
+Pagy::Keyset::Augmented.new(sequel_set)
+#=> #<Pagy::Keyset::Augmented::Sequel:0x00000001066545e0>
 ```
 
 ## Methods
 
-==- `Pagy::KeysetForUI.new(set, **vars)`
+==- `Pagy::Keyset::Augmented.new(set, **vars)`
 
 The constructor takes the `set`, and an optional hash of [variables](#variables). It returns a
-`Pagy::KeysetForUI::ActiveRecord` or
-`Pagy::KeysetForUI::Sequel` object (depending on the `set` class).
+`Pagy::Keyset::Augmented::ActiveRecord` or
+`Pagy::Keyset::Augmented::Sequel` object (depending on the `set` class).
 
 ==- `records`
 
diff --git a/docs/extras/keyset_for_ui.md b/docs/extras/keyset_for_ui.md
index c51321bc8..9555d25d4 100644
--- a/docs/extras/keyset_for_ui.md
+++ b/docs/extras/keyset_for_ui.md
@@ -17,7 +17,7 @@ and other Frontend helpers.
 
 ## Overview
 
-This is a wrapper around the [Pagy::KeysetForUI API](/docs/api/keyset_for_ui.md). Please refer to the following resources:
+This is a wrapper around the [Pagy::Keyset::Augmented API](/docs/api/keyset_for_ui.md). Please refer to the following resources:
 
 [!ref Keyset For UI: Documentation](/docs/api/keyset_for_ui.md)
 
diff --git a/docs/extras/limit.md b/docs/extras/limit.md
index fd445c38d..a2f907d74 100644
--- a/docs/extras/limit.md
+++ b/docs/extras/limit.md
@@ -102,9 +102,9 @@ The `limit` extra adds the `pagy_limit_selector_js` helper to the `Pagy::Fronten
 
 ==- `pagy_limit_selector_js(pagy, **vars)`
 
-!!!warning Not for KeysetForUI instances!
+!!!warning Not for Keyset::Augmented instances!
 
-This helper doesn't make sense, and doesn't work with `Pagy::KeysetForUI` instances.
+This helper doesn't make sense, and doesn't work with `Pagy::Keyset::Augmented` instances.
 !!!
 
 This helper provides a limit selector UI, which allows the user to select any arbitrary limit per page (below the `:limit_max`
diff --git a/gem/apps/keyset.ru b/gem/apps/keyset.ru
index 6fa2900df..985b535a0 100644
--- a/gem/apps/keyset.ru
+++ b/gem/apps/keyset.ru
@@ -40,7 +40,7 @@ Pagy::DEFAULT.freeze
 # Sinatra setup
 require 'sinatra/base'
 # Sinatra application
-class PagyKeyset < Sinatra::Base
+class PagyKeysetAugmented < Sinatra::Base
   include Pagy::Backend
   # Root route/action
   get '/' do
diff --git a/gem/apps/keyset_for_ui.ru b/gem/apps/keyset_augmented.ru
similarity index 93%
rename from gem/apps/keyset_for_ui.ru
rename to gem/apps/keyset_augmented.ru
index ffb2a8060..2e219b8a0 100644
--- a/gem/apps/keyset_for_ui.ru
+++ b/gem/apps/keyset_augmented.ru
@@ -10,8 +10,8 @@
 #    bundle exec pagy -h
 #
 # DEV USAGE
-#    bundle exec pagy clone keyset_for_ui
-#    bundle exec pagy ./keyset_for_ui.ru
+#    bundle exec pagy clone keyet_augmented
+#    bundle exec pagy ./keyset_augmented.ru
 #
 # URL
 #    http://0.0.0.0:8000
@@ -31,16 +31,14 @@ gemfile(ENV['PAGY_INSTALL_BUNDLE'] == 'true') do
 end
 
 # Pagy initializer
-require 'pagy/extras/keyset_for_ui'
 require 'pagy/extras/limit'
-require 'pagy/extras/pagy'
 Pagy::DEFAULT[:limit] = 4
 Pagy::DEFAULT.freeze
 
 # Sinatra setup
 require 'sinatra/base'
 # Sinatra application
-class PagyKeyset < Sinatra::Base
+class PagyKeysetAugmented < Sinatra::Base
   include Pagy::Backend
 
   get('/javascripts/:file') do
@@ -58,7 +56,7 @@ class PagyKeyset < Sinatra::Base
     Time.zone = 'UTC'
 
     @order = { animal: :asc, name: :asc, birthdate: :desc, id: :asc }
-    @pagy, @pets = pagy_keyset_for_ui(Pet.order(@order))
+    @pagy, @pets = pagy_keyset_augmented_js(Pet.order(@order))
     @ids = @pets.pluck(:id)
     erb :main
   end
@@ -78,7 +76,7 @@ class PagyKeyset < Sinatra::Base
       <html lang="en">
       <html>
       <head>
-         <title>Pagy Keyset For UI App</title>
+         <title>Pagy Keyset Augmented App</title>
         <script src="javascripts/pagy.js"></script>
          <script>
           window.addEventListener("load", Pagy.init);
@@ -113,9 +111,9 @@ class PagyKeyset < Sinatra::Base
   template :main do
     <<~ERB
       <div class="content">
-        <h1>Pagy Keyset For UI App</h1>
+        <h1>Pagy Keyset Augmented App</h1>
         <p>Self-contained, standalone app usable to easily reproduce any Keyset For UI related pagy issue
-        with ActiveRecord sets. Notice that Keyset For UI works also with Sequel sets</p>
+        with ActiveRecord sets. Notice that Keyset Augmented works also with Sequel sets</p>
         <p>Please, report the following versions in any new issue.</p>
         <h2>Versions</h2>
         <ul>
@@ -248,4 +246,4 @@ data.each_line(chomp: true) do |pet|
 end
 Pet.insert_all(pets)
 
-run PagyKeyset
+run PagyKeysetAugmented
diff --git a/gem/apps/keyset_sequel.ru b/gem/apps/keyset_sequel.ru
index 379f0d4b0..60d8701da 100644
--- a/gem/apps/keyset_sequel.ru
+++ b/gem/apps/keyset_sequel.ru
@@ -41,7 +41,7 @@ Pagy::DEFAULT.freeze
 require 'sinatra/base'
 require 'logger'
 # Sinatra application
-class PagyKeyset < Sinatra::Base
+class PagyKeysetAugmented < Sinatra::Base
   include Pagy::Backend
   # Root route/action
   get '/' do
@@ -216,4 +216,4 @@ data.each_line(chomp: true) do |pet|
   dataset.insert(name:, animal:, birthdate:)
 end
 
-run PagyKeyset
+run PagyKeysetAugmented
diff --git a/gem/config/pagy.rb b/gem/config/pagy.rb
index 3fd1a27c6..fcd5a66c6 100644
--- a/gem/config/pagy.rb
+++ b/gem/config/pagy.rb
@@ -8,7 +8,7 @@
 # Pagy Variables
 # See https://ddnexus.github.io/pagy/docs/api/pagy#variables
 # You can set any pagy variable as a Pagy::DEFAULT. They can also be overridden per instance by just passing them to
-# Pagy.new|Pagy::Countless.new|Pagy::Calendar::*.new or any of the #pagy* controller methods
+# Pagy::Offset.new|Pagy::Offset::Countless.new|Pagy::Offset::Calendar::*.new or any of the #pagy* controller methods
 # Here are the few that make more sense as DEFAULTs:
 # Pagy::DEFAULT[:limit]      = 20      # default
 # Pagy::DEFAULT[:size]       = 7       # default
@@ -43,11 +43,11 @@
 # See https://ddnexus.github.io/pagy/docs/extras/calendar
 # require 'pagy/extras/calendar'
 # Default for each calendar unit class in IRB:
-# >> Pagy::Calendar::Year::DEFAULT
-# >> Pagy::Calendar::Quarter::DEFAULT
-# >> Pagy::Calendar::Month::DEFAULT
-# >> Pagy::Calendar::Week::DEFAULT
-# >> Pagy::Calendar::Day::DEFAULT
+# >> Pagy::Offset::Calendar::Year::DEFAULT
+# >> Pagy::Offset::Calendar::Quarter::DEFAULT
+# >> Pagy::Offset::Calendar::Month::DEFAULT
+# >> Pagy::Offset::Calendar::Week::DEFAULT
+# >> Pagy::Offset::Calendar::Day::DEFAULT
 #
 # Uncomment the following lines, if you need calendar localization without using the I18n extra
 # module LocalizePagyCalendar
@@ -55,7 +55,7 @@
 #     ::I18n.l(time, **opts)
 #   end
 # end
-# Pagy::Calendar.prepend LocalizePagyCalendar
+# Pagy::Offset::Calendar.prepend LocalizePagyCalendar
 
 # Countless extra: Paginate without any count, saving one query per rendering
 # See https://ddnexus.github.io/pagy/docs/extras/countless
diff --git a/gem/lib/pagy.rb b/gem/lib/pagy.rb
index a002bdae1..e7ec3c3f9 100644
--- a/gem/lib/pagy.rb
+++ b/gem/lib/pagy.rb
@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 require 'pathname'
-require_relative 'pagy/shared_methods'
+require_relative 'pagy/autoloading'
 
 # Top superclass: it should define only what's common to all the subclasses
 class Pagy
@@ -10,63 +10,97 @@ class Pagy
   PAGE_TOKEN  = 'P '
   LABEL_TOKEN = 'L'
   LIMIT_TOKEN = 'L '
-
-  # Core default: constant for easy access, but mutable for customizable defaults
-  DEFAULT = { count_args: [:all],  # AR friendly # rubocop:disable Style/MutableConstant
-              ends:       true,
-              limit:      20,
-              outset:     0,
-              page:       1,
-              page_sym:   :page,
-              size:       7 }
-
+  A_TAG       = '<a href="#" style="display: none;">#</a>'
+  DEFAULT     = { limit: 20, # rubocop:disable Style/MutableConstant
+                  page_sym: :page }
   # Gem root pathname to get the path of Pagy files stylesheets, javascripts, apps, locales, etc.
   def self.root
     @root ||= Pathname.new(__dir__).parent.freeze
   end
 
-  include SharedMethods
-  include SharedUIMethods
-
-  attr_reader :count, :from, :in, :next, :offset, :to
+  attr_reader :page, :limit, :vars
 
-  # Merge and validate the options, do some simple arithmetic and set the instance variables
-  def initialize(**vars)
-    assign_vars(DEFAULT, vars)
-    assign_and_check(count: 0, page: 1, outset: 0)
-    assign_limit
-    assign_offset
-    assign_last
-    check_overflow
-    @from = [@offset - @outset + 1, @count].min
-    @to   = [@offset - @outset + @limit, @count].min
-    @in   = [@to - @from + 1, @count].min
-    assign_prev_and_next
+  # Validates and assign the passed vars: var must be present and value.to_i must be >= to min
+  def assign_and_check(name_min)
+    name_min.each do |name, min|
+      raise VariableError.new(self, name, ">= #{min}", @vars[name]) \
+      unless @vars[name]&.respond_to?(:to_i) && instance_variable_set(:"@#{name}", @vars[name].to_i) >= min
+    end
   end
 
-  # Setup @last (overridden by the gearbox extra)
-  def assign_last
-    @last = [(@count.to_f / @limit).ceil, 1].max
-    @last = @vars[:max_pages] if @vars[:max_pages] && @last > vars[:max_pages]
+  # Assign @limit (overridden by the gearbox extra)
+  def assign_limit
+    assign_and_check(limit: 1)
   end
 
-  # Assign @offset (overridden by the gearbox extra)
-  def assign_offset
-    @offset = (@limit * (@page - 1)) + @outset  # may be already set from gear_box
+  # Assign @vars
+  def assign_vars(vars)
+    cclass  = self.class
+    default = cclass::DEFAULT
+    while cclass != Pagy
+      cclass  = cclass.superclass
+      default = cclass::DEFAULT.merge(default)
+    end
+    @vars   = { **default, **vars.delete_if { |k, v| default.key?(k) && (v.nil? || v == '') } }
   end
 
-  # Assign @prev and @next
-  def assign_prev_and_next
-    @prev = (@page - 1 unless @page == 1)
-    @next = @page == @last ? (1 if @vars[:cycle]) : @page + 1
-  end
+  # Shared with KeysetForUI
+  module SharedUIMethods
+    attr_reader :in, :last, :prev
+    alias pages last
+
+    # Label for the current page. Allow the customization of the output (overridden by the calendar extra)
+    def label = @page.to_s
+
+    # Label for any page. Allow the customization of the output (overridden by the calendar extra)
+    def label_for(page) = page.to_s
+
+    # Return the array of page numbers and :gap e.g. [1, :gap, 8, "9", 10, :gap, 36]
+    def series(size: @vars[:size], **_)
+      raise VariableError.new(self, :size, 'to be an Integer >= 0', size) \
+      unless size.is_a?(Integer) && size >= 0
+      return [] if size.zero?
+
+      [].tap do |series|
+        if size >= @last
+          series.push(*1..@last)
+        else
+          left  = ((size - 1) / 2.0).floor # left half might be 1 page shorter for even size
+          start = if @page <= left # beginning pages
+                    1
+                  elsif @page > (@last - size + left) # end pages
+                    @last - size + 1
+                  else
+                    # intermediate pages
+                    @page - left
+                  end
+          series.push(*start...start + size)
+          # Set first and last pages plus gaps when needed, respecting the size
+          if vars[:ends] && size >= 7
+            series[0]  = 1
+            series[1]  = :gap unless series[1] == 2
+            series[-2] = :gap unless series[-2] == @last - 1
+            series[-1] = @last
+          end
+        end
+        series[series.index(@page)] = @page.to_s unless @overflow # overflow has no current page
+      end
+    end
+
+    # `Pagy` instance method used by the `pagy*_nav_js` helpers.
+    # Return the reverse sorted array of widths, series, and labels generated from the :steps hash
+    # Notice: if :steps is false it will use the single {0 => @vars[:size]} size
+    def sequels(steps: @vars[:steps] || { 0 => @vars[:size] }, **_)
+      raise VariableError.new(self, :steps, 'to define the 0 width', steps) unless steps.key?(0)
+
+      widths, series = steps.sort.reverse.map { |width, size| [width, series(size:)] }.transpose
+      [widths, series, label_sequels(series)]
+    end
 
-  # Checks the @page <= @last
-  def check_overflow
-    raise OverflowError.new(self, :page, "in 1..#{@last}", @page) if @page > @last
+    # Support for the Calendar API
+    def label_sequels(*); end
   end
+  include Autoloading
 end
 
-require_relative 'pagy/backend'
-require_relative 'pagy/frontend'
 require_relative 'pagy/exceptions'
diff --git a/gem/lib/pagy/autoloading.rb b/gem/lib/pagy/autoloading.rb
new file mode 100644
index 000000000..6854eb006
--- /dev/null
+++ b/gem/lib/pagy/autoloading.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+class Pagy
+  autoload :Frontend,           'pagy/frontend'
+  autoload :Backend,            'pagy/backend'
+  autoload :Offset,             'pagy/offset'
+  autoload :Keyset,             'pagy/keyset'
+  autoload :ElasticsearchRails, 'pagy/mixin/elasticsearch_rails'
+  autoload :Meilisearch,        'pagy/mixin/meilisearch'
+  autoload :Searchkick,         'pagy/mixin/searchkick'
+
+  module Autoloading
+    METHOD_MIXINS = { pagy_arel:                   :arel,
+                      pagy_array:                  :array,
+                      pagy_bootstrap_nav:          :bootstrap,
+                      pagy_bootstrap_nav_js:       :bootstrap,
+                      pagy_bootstrap_combo_nav_js: :bootstrap,
+                      pagy_bulma_nav:              :bulma,
+                      pagy_bulma_nav_js:           :bulma,
+                      pagy_bulma_combo_nav_js:     :bulma,
+                      pagy_calendar:               :calendar,
+                      pagy_countless:              :countless,
+                      new_from_elasticserch_rails: :elasticsearch,
+                      pagy_elasticsearch_rails:    :elasticsearch_rails,
+                      pagy_headers:                :headers,
+                      pagy_headers_merge:          :headers,
+                      pagy_keyset:                 :keysets,
+                      pagy_keyset_augmented_js:    :keyset_augmented,
+                      new_from_meilisearch:        :meilisearch,
+                      pagy_meilisearch:            :meilisearch,
+                      pagy_metadata:               :metadata,
+                      pagy_offset:                 :offset,
+                      pagy_nav_js:                 :pagy,
+                      pagy_combo_nav_js:           :pagy,
+                      pagy_prev_url:               :pagy,
+                      pagy_next_url:               :pagy,
+                      pagy_prev_a:                 :pagy,
+                      pagy_next_a:                 :pagy,
+                      pagy_prev_link:              :pagy,
+                      pagy_next_link:              :pagy,
+                      new_from_searchkick:         :searchkick,
+                      pagy_searchkick:             :searchkick }.freeze
+
+    def respond_to_missing?(method, ...)
+      METHOD_MIXINS.key?(method) || super
+    end
+
+    def method_missing(method, ...)
+      return super unless respond_to?(method)
+
+      require_relative "mixin/#{METHOD_MIXINS[method]}"
+      send(method, ...)
+    end
+  end
+end
diff --git a/gem/lib/pagy/b64.rb b/gem/lib/pagy/b64.rb
index 74bcbddab..d77d4a45c 100644
--- a/gem/lib/pagy/b64.rb
+++ b/gem/lib/pagy/b64.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Pagy # :nodoc:
+class Pagy
   # Cheap Base64 specialized methods to avoid dependencies
   module B64
     module_function
diff --git a/gem/lib/pagy/backend.rb b/gem/lib/pagy/backend.rb
index 4f2e6d4d0..0eaf2ef76 100644
--- a/gem/lib/pagy/backend.rb
+++ b/gem/lib/pagy/backend.rb
@@ -8,23 +8,9 @@ class Pagy
   # or any collection by overriding any of the `pagy_*` methods in your controller.
   # See also the extras if you need specialized methods to paginate Arrays or other collections
   module Backend
+    include Pagy::Autoloading
     private
 
-    # Return Pagy object and paginated results
-    def pagy(collection, **vars)
-      vars[:count] ||= pagy_get_count(collection, vars)
-      vars[:limit] ||= pagy_get_limit(vars)
-      vars[:page]  ||= pagy_get_page(vars)
-      pagy = Pagy.new(**vars)
-      [pagy, pagy_get_items(collection, pagy)]
-    end
-
-    # Get the count from the collection
-    def pagy_get_count(collection, vars)
-      count_args = vars[:count_args] || DEFAULT[:count_args]
-      (count     = collection.count(*count_args)).is_a?(Hash) ? count.size : count
-    end
-
     # Sub-method called only by #pagy: here for easy customization of fetching by overriding
     # You may need to override this method for collections without offset|limit
     def pagy_get_items(collection, pagy)
diff --git a/gem/lib/pagy/calendar.rb b/gem/lib/pagy/calendar.rb
deleted file mode 100644
index dbedd698f..000000000
--- a/gem/lib/pagy/calendar.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/calendar
-# frozen_string_literal: true
-
-require_relative '../pagy'
-require_relative 'calendar/unit'
-
-class Pagy # :nodoc:
-  # Calendar class
-  class Calendar < Hash
-    # Specific out of range error
-    class OutOfRangeError < VariableError; end
-
-    # List of units in desc order of duration. It can be used for custom units.
-    UNITS = %i[year quarter month week day]  # rubocop:disable Style/MutableConstant
-
-    class << self
-      private
-
-      # Create a unit subclass instance by using the unit name (internal use)
-      def create(unit, **vars)
-        raise InternalError, "unit must be in #{UNITS.inspect}; got #{unit}" unless UNITS.include?(unit)
-
-        name    = +unit.to_s
-        name[0] = name[0].capitalize
-        Object.const_get("Pagy::Calendar::#{name}").new(**vars)
-      end
-
-      # Return calendar, from, to
-      def init(...)
-        new.send(:init, ...)
-      end
-    end
-
-    # Return the current time of the smallest time unit shown
-    def showtime
-      self[@units.last].from
-    end
-
-    private
-
-    # Create the calendar
-    def init(conf, period, params)
-      @conf  = Marshal.load(Marshal.dump(conf))  # store a copy
-      @units = Calendar::UNITS & @conf.keys # get the units in time length desc order
-      raise ArgumentError, 'no calendar unit found in pagy_calendar @configuration' if @units.empty?
-
-      @period   = period
-      @params   = params
-      @page_sym = conf[:pagy][:page_sym] || DEFAULT[:page_sym]
-      # set all the :page_sym vars for later deletion
-      @units.each { |unit| conf[unit][:page_sym] = :"#{unit}_#{@page_sym}" }
-      calendar = {}
-      object   = nil
-      @units.each_with_index do |unit, index|
-        params_to_delete    = @units[(index + 1), @units.size].map { |sub| conf[sub][:page_sym] } + [@page_sym]
-        conf[unit][:params] = ->(up) { up.except(*params_to_delete.map(&:to_s)) }
-        conf[unit][:period] = object&.send(:active_period) || @period
-        conf[unit][:page]   = @params[:"#{unit}_#{@page_sym}"] # requested page
-        # :nocov:
-        conf[unit][:counts] = yield(unit, conf[unit][:period]) if block_given?  # nocov doesn't need to fail block_given?
-        # :nocov:
-        calendar[unit]      = object \
-                            = Calendar.send(:create, unit, **conf[unit])
-      end
-      [replace(calendar), object.from, object.to]
-    end
-
-    # Return the calendar object at time
-    def calendar_at(time, **opts)
-      conf      = Marshal.load(Marshal.dump(@conf))
-      page_syms = {}
-      @units.inject(nil) do |object, unit|
-        conf[unit][:period] = object&.send(:active_period) || @period
-        conf[unit][:page]   = page_syms[:"#{unit}_#{@page_sym}"] \
-                            = Calendar.send(:create, unit, **conf[unit]).send(:page_at, time, **opts)
-        conf[unit][:params] ||= {}
-        conf[unit][:params].merge!(page_syms)
-        Calendar.send(:create, unit, **conf[unit])
-      end
-    end
-  end
-  # Require the subclass files in UNITS (no custom unit at this point yet)
-  Calendar::UNITS.each { |unit| require "pagy/calendar/#{unit}" }
-end
diff --git a/gem/lib/pagy/calendar/day.rb b/gem/lib/pagy/calendar/day.rb
deleted file mode 100644
index 98fd4fbb4..000000000
--- a/gem/lib/pagy/calendar/day.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/calendar
-# frozen_string_literal: true
-
-class Pagy # :nodoc:
-  class Calendar # :nodoc:
-    # Day unit subclass
-    class Day < Unit
-      DEFAULT = { size:   31,   # rubocop:disable Style/MutableConstant
-                  ends: false,
-                  order:  :asc,
-                  format: '%d' }
-
-      protected
-
-      # Set up the calendar variables
-      def assign_unit_vars
-        super
-        @initial = @starting.beginning_of_day
-        @final   = @ending.tomorrow.beginning_of_day
-        @last    = page_offset(@initial, @final)
-        @from    = starting_time_for(@page)
-        @to      = @from.tomorrow
-      end
-
-      # Starting time for the page
-      def starting_time_for(page)
-        @initial.days_since(time_offset_for(page))
-      end
-
-      def page_offset_at(time)
-        page_offset(@initial, time.beginning_of_day)
-      end
-
-      private
-
-      def page_offset(time_a, time_b)  # remove in 6.0
-        (time_b.time - time_a.time).to_i / 1.day
-      end
-    end
-  end
-end
diff --git a/gem/lib/pagy/calendar/month.rb b/gem/lib/pagy/calendar/month.rb
deleted file mode 100644
index 40e51a625..000000000
--- a/gem/lib/pagy/calendar/month.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/calendar
-# frozen_string_literal: true
-
-class Pagy # :nodoc:
-  class Calendar # :nodoc:
-    # Month unit subclass
-    class Month < Unit
-      DEFAULT = { size: 12,   # rubocop:disable Style/MutableConstant
-                  ends: false,
-                  order: :asc,
-                  format: '%b' }
-
-      protected
-
-      # Set up the calendar variables
-      def assign_unit_vars
-        super
-        @initial = @starting.beginning_of_month
-        @final   = @ending.next_month.beginning_of_month
-        @last    = (months_in(@final) - months_in(@initial))
-        @from    = starting_time_for(@page)
-        @to      = @from.next_month
-      end
-
-      # Starting time for the page
-      def starting_time_for(page)
-        @initial.months_since(time_offset_for(page))
-      end
-
-      def page_offset_at(time)
-        months_in(time.beginning_of_month) - months_in(@initial)
-      end
-
-      private
-
-      # Number of months in time
-      def months_in(time)
-        (time.year * 12) + time.month
-      end
-    end
-  end
-end
diff --git a/gem/lib/pagy/calendar/quarter.rb b/gem/lib/pagy/calendar/quarter.rb
deleted file mode 100644
index b72059440..000000000
--- a/gem/lib/pagy/calendar/quarter.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/calendar
-# frozen_string_literal: true
-
-class Pagy # :nodoc:
-  class Calendar # :nodoc:
-    # Quarter unit subclass
-    class Quarter < Unit
-      DEFAULT = { size:   4,      # rubocop:disable Style/MutableConstant
-                  ends: false,
-                  order:  :asc,
-                  format: 'Q%q' } # '%q' token
-
-      # The label for any page, with the substitution of the '%q' token
-      def label_for(page, opts = {})
-        starting_time = starting_time_for(page.to_i)  # page could be a string
-        opts[:format] = (opts[:format] || @vars[:format]).gsub('%q') { (starting_time.month / 3.0).ceil }
-        localize(starting_time, opts)
-      end
-
-      protected
-
-      # Set up the calendar variables
-      def assign_unit_vars
-        super
-        @initial = @starting.beginning_of_quarter
-        @final   = @ending.next_quarter.beginning_of_quarter
-        @last    = (months_in(@final) - months_in(@initial)) / 3
-        @from    = starting_time_for(@page)
-        @to      = @from.next_quarter
-      end
-
-      # Starting time for the page
-      def starting_time_for(page)
-        @initial.months_since(time_offset_for(page) * 3)
-      end
-
-      def page_offset_at(time)
-        (months_in(time.beginning_of_quarter) - months_in(@initial)) / 3
-      end
-
-      private
-
-      # Number of months in time
-      def months_in(time)
-        (time.year * 12) + time.month
-      end
-    end
-  end
-end
diff --git a/gem/lib/pagy/calendar/unit.rb b/gem/lib/pagy/calendar/unit.rb
deleted file mode 100644
index c91b3d4b0..000000000
--- a/gem/lib/pagy/calendar/unit.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-# frozen_string_literal: true
-
-require 'active_support'
-require 'active_support/core_ext/time'
-require 'active_support/core_ext/date_and_time/calculations'
-require 'active_support/core_ext/numeric/time'
-require 'active_support/core_ext/integer/time'
-
-class Pagy # :nodoc:
-  class Calendar < Hash # :nodoc:
-    # Base class for time units subclasses (Year, Quarter, Month, Week, Day)
-    class Unit < Pagy
-      attr_reader :order, :from, :to
-
-      # Merge and validate the options, do some simple arithmetic and set a few instance variables
-      def initialize(**vars)    # rubocop:disable Lint/MissingSuper
-        raise InternalError, 'Pagy::Calendar::Unit is a base class; use one of its subclasses' \
-            if instance_of?(Pagy::Calendar::Unit)
-
-        assign_vars({ **Pagy::DEFAULT, **self.class::DEFAULT }, vars)
-        assign_and_check(page: 1)
-        assign_unit_vars
-        check_overflow
-        assign_prev_and_next
-      end
-
-      # The label for the current page (it can pass along the I18n gem opts when it's used with the i18n extra)
-      def label(opts = {})
-        label_for(@page, opts)
-      end
-
-      # The label for any page (it can pass along the I18n gem opts when it's used with the i18n extra)
-      def label_for(page, opts = {})
-        opts[:format] ||= @vars[:format]
-        localize(starting_time_for(page.to_i), opts)  # page could be a string
-      end
-
-      protected
-
-      # The page that includes time
-      # In case of out of range time, the :fit_time option avoids the outOfRangeError
-      # and returns the closest page to the passed time argument (first or last page)
-      def page_at(time, **opts)
-        fit_time  = time
-        fit_final = @final - 1
-        unless time.between?(@initial, fit_final)
-          raise OutOfRangeError.new(self, :time, "between #{@initial} and #{fit_final}", time) unless opts[:fit_time]
-
-          if time < @final
-            fit_time = @initial
-            ordinal  = 'first'
-          else
-            fit_time = fit_final
-            ordinal  = 'last'
-          end
-          warn "Pagy::Calendar#page_at: Rescued #{time} out of range by returning the #{ordinal} page."
-        end
-        offset = page_offset_at(fit_time)   # offset starts from 0
-        @order == :asc ? offset + 1 : @last - offset
-      end
-
-      # Base class method for the setup of the unit variables (subclasses must implement it and call super)
-      def assign_unit_vars
-        raise VariableError.new(self, :format, 'to be a strftime format', @vars[:format]) unless @vars[:format].is_a?(String)
-        raise VariableError.new(self, :order, 'to be in [:asc, :desc]', @order) \
-        unless %i[asc desc].include?(@order = @vars[:order])
-
-        @starting, @ending = @vars[:period]
-        raise VariableError.new(self, :period, 'to be a an Array of min and max TimeWithZone instances', @vars[:period]) \
-        unless @starting.is_a?(ActiveSupport::TimeWithZone) \
-        && @ending.is_a?(ActiveSupport::TimeWithZone) && @starting <= @ending
-      end
-
-      # Apply the strftime format to the time (overridden by the i18n extra when localization is required)
-      def localize(time, opts)
-        time.strftime(opts[:format])
-      end
-
-      # Number of time units to offset from the @initial time, in order to get the ordered starting time for the page.
-      # Used in starting_time_for(page) where page starts from 1 (e.g. page to starting_time means subtracting 1)
-      def time_offset_for(page)
-        @order == :asc ? page - 1 : @last - page
-      end
-
-      # Period of the active page (used internally for nested units)
-      def active_period
-        [[@starting, @from].max, [@to - 1, @ending].min] # -1 sec: include only last unit day
-      end
-
-      # :nocov:
-      # This method must be implemented by the unit subclass
-      def starting_time_for(*)
-        raise NoMethodError, 'the starting_time_for method must be implemented by the unit subclass'
-      end
-
-      # This method must be implemented by the unit subclass
-      def page_offset_at(*)
-        raise NoMethodError, 'the page_offset_at method must be implemented by the unit subclass'
-      end
-      # :nocov:
-    end
-  end
-end
diff --git a/gem/lib/pagy/calendar/week.rb b/gem/lib/pagy/calendar/week.rb
deleted file mode 100644
index 0e01ff1e9..000000000
--- a/gem/lib/pagy/calendar/week.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/calendar
-# frozen_string_literal: true
-
-class Pagy # :nodoc:
-  class Calendar # :nodoc:
-    # Week unit subclass
-    class Week < Unit
-      DEFAULT  = { order:  :asc,      # rubocop:disable Style/MutableConstant
-                   format: '%Y-%W' }
-
-      protected
-
-      # Set up the calendar variables
-      def assign_unit_vars
-        super
-        @initial = @starting.beginning_of_week
-        @final   = @ending.next_week.beginning_of_week
-        @last    = page_offset(@initial, @final)
-        @from    = starting_time_for(@page)
-        @to      = @from.next_week
-      end
-
-      # Starting time for the page
-      def starting_time_for(page)
-        @initial.weeks_since(time_offset_for(page))
-      end
-
-      def page_offset_at(time)
-        page_offset(@initial, time.beginning_of_week)
-      end
-
-      private
-
-      def page_offset(time_a, time_b)  # remove in 6.0
-        (time_b.time - time_a.time).to_i / 1.week
-      end
-    end
-  end
-end
diff --git a/gem/lib/pagy/calendar/year.rb b/gem/lib/pagy/calendar/year.rb
deleted file mode 100644
index c5671c749..000000000
--- a/gem/lib/pagy/calendar/year.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/calendar
-# frozen_string_literal: true
-
-class Pagy # :nodoc:
-  class Calendar # :nodoc:
-    # Year unit subclass
-    class Year < Unit
-      DEFAULT = { size:   10,   # rubocop:disable Style/MutableConstant
-                  ends: false,
-                  order:  :asc,
-                  format: '%Y' }
-
-      protected
-
-      # Set up the calendar variables
-      def assign_unit_vars
-        super
-        @initial = @starting.beginning_of_year
-        @final   = @ending.next_year.beginning_of_year
-        @last    = @final.year - @initial.year
-        @from    = starting_time_for(@page)
-        @to      = @from.next_year
-      end
-
-      # Starting time for the page
-      def starting_time_for(page)
-        @initial.years_since(time_offset_for(page))
-      end
-
-      def page_offset_at(time)
-        time.beginning_of_year.year - @initial.year
-      end
-    end
-  end
-end
diff --git a/gem/lib/pagy/countless.rb b/gem/lib/pagy/countless.rb
deleted file mode 100644
index da6d82d55..000000000
--- a/gem/lib/pagy/countless.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/countless
-# frozen_string_literal: true
-
-class Pagy # :nodoc:
-  # No need to know the count to paginate
-  class Countless < Pagy
-    # Merge and validate the options, do some simple arithmetic and set a few instance variables
-    def initialize(**vars) # rubocop:disable Lint/MissingSuper
-      assign_vars(DEFAULT, vars)
-      assign_and_check(page: 1, outset: 0)
-      assign_limit
-      assign_offset
-    end
-
-    # Finalize the instance variables based on the fetched size
-    def finalize(fetched_size)
-      raise OverflowError.new(self, :page, "to be < #{@page}", @page) if fetched_size.zero? && @page > 1
-
-      @last = fetched_size > @limit ? @page + 1 : @page
-      @last = @vars[:max_pages] if @vars[:max_pages] && @last > @vars[:max_pages]
-      check_overflow
-      @in   = [fetched_size, @limit].min
-      @from = @in.zero? ? 0 : @offset - @outset + 1
-      @to   = @offset - @outset + @in
-      assign_prev_and_next
-      self
-    end
-  end
-
-  module SeriesOverride # :nodoc:
-    # Override the original series.
-    # Return nil if :countless_minimal is enabled
-    def series(**)
-      super unless @vars[:countless_minimal]
-    end
-  end
-  prepend SeriesOverride
-end
diff --git a/gem/lib/pagy/extras/arel.rb b/gem/lib/pagy/extras/arel.rb
deleted file mode 100644
index 9d1840f8f..000000000
--- a/gem/lib/pagy/extras/arel.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/arel
-# frozen_string_literal: true
-
-class Pagy # :nodoc:
-  # Better performance of grouped ActiveRecord collections
-  module ArelExtra
-    private
-
-    # Return Pagy object and paginated collection/results
-    def pagy_arel(collection, **vars)
-      vars[:count] ||= pagy_arel_count(collection)
-      pagy(collection, **vars)
-    end
-
-    # Count using Arel when grouping
-    def pagy_arel_count(collection)
-      if collection.group_values.empty?
-        # COUNT(*)
-        collection.count(:all)
-      else
-        # COUNT(*) OVER ()
-        sql = Arel.star.count.over(Arel::Nodes::Grouping.new([]))
-        collection.unscope(:order).pick(sql).to_i
-      end
-    end
-  end
-  Backend.prepend ArelExtra
-end
diff --git a/gem/lib/pagy/extras/array.rb b/gem/lib/pagy/extras/array.rb
deleted file mode 100644
index 03bb895db..000000000
--- a/gem/lib/pagy/extras/array.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/array
-# frozen_string_literal: true
-
-class Pagy # :nodoc:
-  # Paginate arrays efficiently, avoiding expensive array-wrapping and without overriding
-  module ArrayExtra
-    private
-
-    # Return Pagy object and paginated items
-    def pagy_array(array, **vars)
-      vars[:count] ||= array.size
-      vars[:limit] ||= pagy_get_limit(vars)
-      vars[:page]  ||= pagy_get_page(vars)
-      pagy = Pagy.new(**vars)
-      [pagy, array[pagy.offset, pagy.limit]]
-    end
-  end
-  Backend.prepend ArrayExtra
-end
diff --git a/gem/lib/pagy/extras/countless.rb b/gem/lib/pagy/extras/countless.rb
deleted file mode 100644
index 5c2286843..000000000
--- a/gem/lib/pagy/extras/countless.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/countless
-# frozen_string_literal: true
-
-require_relative '../countless'
-
-class Pagy # :nodoc:
-  DEFAULT[:countless_minimal] = false
-
-  # Paginate without the need of any count, saving one query per rendering
-  module CountlessExtra
-    private
-
-    # Return Pagy object and records
-    def pagy_countless(collection, **vars)
-      vars[:limit] ||= pagy_get_limit(vars)
-      vars[:page]  ||= pagy_get_page(vars)
-      pagy = Countless.new(**vars)
-      [pagy, pagy_countless_get_items(collection, pagy)]
-    end
-
-    # Sub-method called only by #pagy_countless: here for easy customization of record-extraction by overriding
-    # You may need to override this method for collections without offset|limit
-    def pagy_countless_get_items(collection, pagy)
-      return collection.offset(pagy.offset).limit(pagy.limit) if pagy.vars[:countless_minimal]
-
-      fetched = collection.offset(pagy.offset).limit(pagy.limit + 1).to_a # eager load limit + 1
-      pagy.finalize(fetched.size)                                         # finalize the pagy object
-      fetched[0, pagy.limit]                                              # ignore eventual extra item
-    end
-  end
-  Backend.prepend CountlessExtra
-end
diff --git a/gem/lib/pagy/extras/gearbox.rb b/gem/lib/pagy/extras/gearbox.rb
index 773f0dcbe..74b126b8f 100644
--- a/gem/lib/pagy/extras/gearbox.rb
+++ b/gem/lib/pagy/extras/gearbox.rb
@@ -1,55 +1,60 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/gearbox
 # frozen_string_literal: true
 
-class Pagy # :nodoc:
-  DEFAULT[:gearbox_extra] = true # extra enabled by default
-  DEFAULT[:gearbox_limit] = [15, 30, 60, 100]
+require_relative '../offset'
+
+class Pagy
+  Offset::DEFAULT[:gearbox_extra] = true # extra enabled by default
+  Offset::DEFAULT[:gearbox_limit] = [15, 30, 60, 100]
 
   # Automatically change the limit depending on the page number
   # accepts an array as the :gearbox_limit variable, that will determine the limit for the first pages
   module GearboxExtra
-    # Assign @limit based on the :gearbox_limit variable
-    def assign_limit
-      return super if !@vars[:gearbox_extra] || @vars[:limit_extra]
-
-      gears = @vars[:gearbox_limit]
-      raise VariableError.new(self, :gearbox_limit, 'to be an Array of positives', gears) \
-            unless gears.is_a?(Array) && gears.all? { |num| num.positive? rescue false } # rubocop:disable Style/RescueModifier
-
-      @limit = gears[@page - 1] || gears.last
-    end
-
-    # Asgnsi @offset based on the :gearbox_limit variable
-    def assign_offset
-      return super if !@vars[:gearbox_extra] || @vars[:limit_extra]
-
-      gears   = @vars[:gearbox_limit]
-      @offset = if @page <= gears.count
-                  gears[0, @page - 1].sum
-                else
-                  gears.sum + (gears.last * (@page - gears.count - 1))
-                end + @outset
-    end
 
-    # Assign @last based on the :gearbox_limit variable and @count
-    def assign_last
-      return super if !@vars[:gearbox_extra] || @vars[:limit_extra]
-
-      gears = @vars[:gearbox_limit]
-      # This algorithm is thousands of times faster than the one in the geared_pagination gem
-      @last = (if count > (sum = gears.sum)
-                 [((count - sum).to_f / gears.last).ceil, 1].max + gears.count
-               else
-                 pages     = 0
-                 remainder = count
-                 while remainder.positive?
-                   pages     += 1
-                   remainder -= gears[pages - 1]
-                 end
-                 [pages, 1].max
-               end)
-      @last = @vars[:max_pages] if @vars[:max_pages] && @last > @vars[:max_pages]
+    module OffsetOverride
+      # Assign @limit based on the :gearbox_limit variable
+      def assign_limit
+        return super if !@vars[:gearbox_extra] || @vars[:limit_extra]
+
+        gears = @vars[:gearbox_limit]
+        raise VariableError.new(self, :gearbox_limit, 'to be an Array of positives', gears) \
+              unless gears.is_a?(Array) && gears.all? { |num| num.positive? rescue false } # rubocop:disable Style/RescueModifier
+
+        @limit = gears[@page - 1] || gears.last
+      end
+
+      # Asgnsi @offset based on the :gearbox_limit variable
+      def assign_offset
+        return super if !@vars[:gearbox_extra] || @vars[:limit_extra]
+
+        gears   = @vars[:gearbox_limit]
+        @offset = if @page <= gears.count
+                    gears[0, @page - 1].sum
+                  else
+                    gears.sum + (gears.last * (@page - gears.count - 1))
+                  end + @outset
+      end
+
+      # Assign @last based on the :gearbox_limit variable and @count
+      def assign_last
+        return super if !@vars[:gearbox_extra] || @vars[:limit_extra]
+
+        gears = @vars[:gearbox_limit]
+        # This algorithm is thousands of times faster than the one in the geared_pagination gem
+        @last = (if count > (sum = gears.sum)
+                   [((count - sum).to_f / gears.last).ceil, 1].max + gears.count
+                 else
+                   pages     = 0
+                   remainder = count
+                   while remainder.positive?
+                     pages     += 1
+                     remainder -= gears[pages - 1]
+                   end
+                   [pages, 1].max
+                 end)
+        @last = @vars[:max_pages] if @vars[:max_pages] && @last > @vars[:max_pages]
+      end
     end
+    Offset.prepend(OffsetOverride)
   end
-  prepend GearboxExtra
 end
diff --git a/gem/lib/pagy/extras/i18n.rb b/gem/lib/pagy/extras/i18n.rb
index dd81b10e3..53c84fa95 100644
--- a/gem/lib/pagy/extras/i18n.rb
+++ b/gem/lib/pagy/extras/i18n.rb
@@ -1,7 +1,7 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/i18n
 # frozen_string_literal: true
 
-class Pagy # :nodoc:
+class Pagy
   # Use ::I18n gem
   module I18nExtra
     # Frontend overriding for translation
@@ -19,7 +19,7 @@ def localize(time, opts)
       end
     end
   end
-  Calendar::Unit.prepend I18nExtra::CalendarOverride if defined?(::Pagy::Calendar::Unit)
+  Offset::Calendar::Unit.prepend I18nExtra::CalendarOverride if defined?(::Pagy::Offset::Calendar::Unit)
 
   # Add the pagy locales to the I18n.load_path
   ::I18n.load_path += Dir[Pagy.root.join('locales', '*.yml')]
diff --git a/gem/lib/pagy/extras/jsonapi.rb b/gem/lib/pagy/extras/jsonapi.rb
index 49c7ada6b..73280d646 100644
--- a/gem/lib/pagy/extras/jsonapi.rb
+++ b/gem/lib/pagy/extras/jsonapi.rb
@@ -3,7 +3,7 @@
 
 require_relative '../url_helpers'
 
-class Pagy # :nodoc:
+class Pagy
   DEFAULT[:jsonapi] = true
 
   # Add a specialized backend method compliant with JSON:API
diff --git a/gem/lib/pagy/extras/keyset.rb b/gem/lib/pagy/extras/keyset.rb
deleted file mode 100644
index a76862f2a..000000000
--- a/gem/lib/pagy/extras/keyset.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/keyset
-# frozen_string_literal: true
-
-require_relative '../keyset'
-
-class Pagy # :nodoc:
-  # Add keyset methods
-  module KeysetExtra
-    private
-
-    # Return Pagy::Keyset object and paginated records
-    def pagy_keyset(set, **vars)
-      vars[:limit] ||= pagy_get_limit(vars)
-      vars[:page]  ||= pagy_get_page(vars, force_integer: false) # allow nil
-      pagy = Keyset.new(set, **vars)
-      [pagy, pagy.records]
-    end
-
-    # Return the URL string for the first page
-    def pagy_keyset_first_url(pagy, **vars)
-      pagy_page_url(pagy, nil, **vars)
-    end
-
-    # Return the URL string for the next page or nil
-    def pagy_keyset_next_url(pagy, **vars)
-      pagy_page_url(pagy, pagy.next, **vars) if pagy.next
-    end
-  end
-  Backend.prepend KeysetExtra
-end
diff --git a/gem/lib/pagy/extras/keyset_for_ui.rb b/gem/lib/pagy/extras/keyset_for_ui.rb
deleted file mode 100644
index 848ab2114..000000000
--- a/gem/lib/pagy/extras/keyset_for_ui.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/keyset_frontendble
-# frozen_string_literal: true
-
-require_relative '../keyset_for_ui'
-require_relative 'countless'
-require_relative '../frontend/javascript'
-
-class Pagy # :nodoc:
-  # Add keyset UI Compatible methods
-  module KeysetForUIExtra
-    private
-
-    # Return Pagy::KeysetForUI object and paginated records
-    def pagy_keyset_for_ui(set, **vars)
-      page = pagy_get_page(vars, force_integer: false) # allow nil
-      if page.to_i.positive?    # numeric page -> no augmentation -> fallback
-        return pagy_countless(set, **vars)
-      elsif page.is_a?(String)  # augmented page param
-        page_args = JSON.parse(B64.urlsafe_decode(page))
-        # Restart the pagination from page 1 if the url has been requested from another browser
-        vars[:page] = page_args if request.cookies['pagy'] == page_args.shift
-      end
-
-      vars[:limit] ||= pagy_get_limit(vars)
-      pagy = KeysetForUI.new(set, **vars)
-      [pagy, pagy.records]
-    end
-  end
-  Backend.prepend KeysetForUIExtra
-
-  # Add the arguments for the client to the pagy_data for the *nav helpers
-  module DataHelperOverride
-    def pagy_data(pagy, *args)
-      args.push([pagy.vars[:page_sym], pagy.update]) if pagy.is_a?(::Pagy::KeysetForUI) && args[0].to_s.match(/^n/)
-      super
-    end
-  end
-  Frontend::Javascript::DataHelpers.prepend DataHelperOverride
-end
diff --git a/gem/lib/pagy/extras/limit.rb b/gem/lib/pagy/extras/limit.rb
index 57b2d52b5..e9dc3e673 100644
--- a/gem/lib/pagy/extras/limit.rb
+++ b/gem/lib/pagy/extras/limit.rb
@@ -1,9 +1,7 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/limit
 # frozen_string_literal: true
 
-require_relative '../frontend/javascript'
-
-class Pagy # :nodoc:
+class Pagy
   DEFAULT[:limit_sym]   = :limit
   DEFAULT[:limit_max]   = 100
   DEFAULT[:limit_extra] = true   # extra enabled by default
@@ -45,7 +43,7 @@ def pagy_limit_selector_js(pagy, id: nil, item_name: nil)
 
         limit_input = %(<input name="limit" type="number" min="1" max="#{vars[:limit_max]}" value="#{
                           limit}" style="padding: 0; text-align: center; width: #{limit.to_s.length + 1}rem;">#{
-                          Frontend::Javascript::A_TAG})
+                          A_TAG})
 
         %(<span#{id} class="pagy limit-selector-js" #{
             pagy_data(pagy, :sj, pagy.from, url_token)
diff --git a/gem/lib/pagy/extras/overflow.rb b/gem/lib/pagy/extras/overflow.rb
deleted file mode 100644
index d4be9634d..000000000
--- a/gem/lib/pagy/extras/overflow.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/overflow
-# frozen_string_literal: true
-
-class Pagy # :nodoc:
-  DEFAULT[:overflow] = :empty_page
-
-  # Handles OverflowError exceptions for different classes with different options
-  module OverflowExtra
-    # Support for Pagy class
-    module PagyOverride
-      # Is the requested page overflowing?
-      def overflow?
-        @overflow
-      end
-
-      # Add rescue clause for different behaviors
-      def initialize(**vars)
-        @overflow ||= false                            # still true if :last_page re-run the method after an overflow
-        super
-      rescue OverflowError
-        @overflow = true                               # add the overflow flag
-        case @vars[:overflow]
-        when :exception
-          raise                                        # same as without the extra
-        when :last_page
-          requested_page = @vars[:page]                # save the requested page (even after re-run)
-          initialize(**vars, page: @last)              # re-run with the last page
-          @vars[:page] = requested_page                # restore the requested page
-        when :empty_page
-          @in = @from = @to = 0                        # vars relative to the actual page
-          if defined?(::Pagy::Calendar::Unit) \
-              && is_a?(Calendar::Unit)                 # only for Calendar::Units instances
-            edge = @order == :asc ? @final : @initial  # get the edge of the overflow side (neat, but any time would do)
-            @from = @to = edge                         # set both to the edge time (a >=&&< query will get no records)
-          end
-          @prev = @last                                # prev relative to the actual page
-          extend Series                                # special series for :empty_page
-        else
-          raise VariableError.new(self, :overflow, 'to be in [:last_page, :empty_page, :exception]', @vars[:overflow])
-        end
-      end
-
-      # Special series for empty page
-      module Series
-        def series(*, **)
-          @page = @last                                # series for last page
-          super.tap do |s|                             # call original series
-            s[s.index(@page.to_s)] = @page             # string to integer (i.e. no current page)
-            @page = @vars[:page]                       # restore the actual page
-          end
-        end
-      end
-    end
-    Pagy.prepend PagyOverride
-    Pagy::Calendar::Unit.prepend PagyOverride if defined?(::Pagy::Calendar::Unit)
-
-    # Support for Pagy::Countless class
-    module CountlessOverride
-      # Add rescue clause for different behaviors
-      def finalize(fetched_size)
-        @overflow = false
-        super
-      rescue OverflowError
-        @overflow = true                               # add the overflow flag
-        case @vars[:overflow]
-        when :exception
-          raise                                        # same as without the extra
-        when :empty_page
-          @offset = @limit = @from = @to = 0           # vars relative to the actual page
-          @vars[:size] = 0                             # no page in the series
-          self
-        else
-          raise VariableError.new(self, :overflow, 'to be in [:empty_page, :exception]', @vars[:overflow])
-        end
-      end
-    end
-    # :nocov:
-    Pagy::Countless.prepend CountlessOverride if defined?(::Pagy::Countless)
-    # :nocov:
-  end
-end
diff --git a/gem/lib/pagy/extras/size.rb b/gem/lib/pagy/extras/size.rb
index 19fa0b8e8..8527d29f1 100644
--- a/gem/lib/pagy/extras/size.rb
+++ b/gem/lib/pagy/extras/size.rb
@@ -1,40 +1,42 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/size
 # frozen_string_literal: true
 
-class Pagy # :nodoc:
-  # Implement the legacy bar using the array size.
-  # Unless you have very specific requirements, use the faster and better looking default bar.
-  module SizeExtra
-    # Implements the old series algorithm
-    def series(size: @vars[:size], **_)
-      return super unless size.is_a?(Array)
-      return [] if size == []
-      raise VariableError.new(self, :size, 'to be an Array of 4 Integers or []', size) \
-            unless size.is_a?(Array) && size.size == 4 && size.all? { |num| !num.negative? rescue false } # rubocop:disable Style/RescueModifier
+class Pagy
+  class Offset
+    # Implement the legacy bar using the array size.
+    # Unless you have very specific requirements, use the faster and better looking default bar.
+    module SizeExtra
+      # Implements the old series algorithm
+      def series(size: @vars[:size], **_)
+        return super unless size.is_a?(Array)
+        return [] if size == []
+        raise VariableError.new(self, :size, 'to be an Array of 4 Integers or []', size) \
+              unless size.is_a?(Array) && size.size == 4 && size.all? { |num| !num.negative? rescue false } # rubocop:disable Style/RescueModifier
 
-      [].tap do |series|
-        # This algorithm is up to ~5x faster and ~2.3x lighter than the previous one (pagy < 4.3)
-        # However the behavior of the legacy nav bar was taken straight from WillPaginate and Kaminari:
-        # it's ill-concieved and complicates the experience of devs and users.
-        left_gap_start  = 1 + size[0]
-        left_gap_end    = @page - size[1] - 1
-        right_gap_start = @page + size[2] + 1
-        right_gap_end   = @last - size[3]
-        left_gap_end    = right_gap_end  if left_gap_end   > right_gap_end
-        right_gap_start = left_gap_start if left_gap_start > right_gap_start
-        start           = 1
-        if (left_gap_end - left_gap_start).positive?
-          series.push(*start...left_gap_start, :gap)
-          start = left_gap_end + 1
+        [].tap do |series|
+          # This algorithm is up to ~5x faster and ~2.3x lighter than the previous one (pagy < 4.3)
+          # However the behavior of the legacy nav bar was taken straight from WillPaginate and Kaminari:
+          # it's ill-concieved and complicates the experience of devs and users.
+          left_gap_start  = 1 + size[0]
+          left_gap_end    = @page - size[1] - 1
+          right_gap_start = @page + size[2] + 1
+          right_gap_end   = @last - size[3]
+          left_gap_end    = right_gap_end  if left_gap_end   > right_gap_end
+          right_gap_start = left_gap_start if left_gap_start > right_gap_start
+          start           = 1
+          if (left_gap_end - left_gap_start).positive?
+            series.push(*start...left_gap_start, :gap)
+            start = left_gap_end + 1
+          end
+          if (right_gap_end - right_gap_start).positive?
+            series.push(*start...right_gap_start, :gap)
+            start = right_gap_end + 1
+          end
+          series.push(*start..@last)
+          series[series.index(@page)] = @page.to_s
         end
-        if (right_gap_end - right_gap_start).positive?
-          series.push(*start...right_gap_start, :gap)
-          start = right_gap_end + 1
-        end
-        series.push(*start..@last)
-        series[series.index(@page)] = @page.to_s
       end
     end
+    prepend SizeExtra
   end
-  prepend SizeExtra
 end
diff --git a/gem/lib/pagy/extras/standalone.rb b/gem/lib/pagy/extras/standalone.rb
index 5396fee73..937d2e212 100644
--- a/gem/lib/pagy/extras/standalone.rb
+++ b/gem/lib/pagy/extras/standalone.rb
@@ -3,7 +3,7 @@
 
 require_relative '../url_helpers'
 
-class Pagy # :nodoc:
+class Pagy
   # Use pagy without any request object, nor Rack environment/gem, nor any defined params method,
   # even in the irb/rails console without any app or config.
   # Define a dummy params method if it's not already defined in the including module
diff --git a/gem/lib/pagy/frontend.rb b/gem/lib/pagy/frontend.rb
index ae9c967da..f29c53887 100644
--- a/gem/lib/pagy/frontend.rb
+++ b/gem/lib/pagy/frontend.rb
@@ -8,13 +8,14 @@ class Pagy
   # Frontend modules are specially optimized for performance.
   # The resulting code may not look very elegant, but produces the best benchmarks
   module Frontend
+    include Pagy::Autoloading
     include UrlHelpers
 
     # Return a performance optimized lambda to generate the HTML anchor element (a tag)
     # Benchmarked on a 20 link nav: it is ~22x faster and uses ~18x less memory than rails' link_to
     def pagy_anchor(pagy, anchor_string: nil, **vars)
       anchor_string &&= %( #{anchor_string})
-      left, right = %(<a#{anchor_string} href="#{pagy_page_url(pagy, PAGE_TOKEN, **vars)}").split(PAGE_TOKEN, 2)
+      left, right   = %(<a#{anchor_string} href="#{pagy_page_url(pagy, PAGE_TOKEN, **vars)}").split(PAGE_TOKEN, 2)
       # lambda used by all the helpers
       lambda do |page, text = pagy.label_for(page), classes: nil, aria_label: nil|
         classes    = %( class="#{classes}") if classes
@@ -36,20 +37,21 @@ def pagy_info(pagy, id: nil, item_name: nil)
                 end
 
       %(<span#{id} class="pagy info">#{
-          pagy_t key, item_name: item_name || pagy_t('pagy.item_name', count: p_count),
-                      count: p_count, from: pagy.from, to: pagy.to
-        }</span>)
+      pagy_t key, item_name: item_name || pagy_t('pagy.item_name', count: p_count),
+             count:          p_count, from: pagy.from, to: pagy.to
+      }</span>)
     end
 
     # Generic pagination: it returns the html with the series of links to the pages
     def pagy_nav(pagy, id: nil, aria_label: nil, **vars)
       id   = %( id="#{id}") if id
       a    = pagy_anchor(pagy, **vars)
-      data = %( #{pagy_data(pagy, :n)}) if defined?(::Pagy::KeysetForUI) && pagy.is_a?(KeysetForUI)
+      data = %( #{pagy_data(pagy, :n)}) if defined?(::Pagy::Keyset::Augmented) && pagy.is_a?(Keyset::Augmented)
 
       html = %(<nav#{id} class="pagy nav" #{nav_aria_label(pagy, aria_label:)}#{data}>#{
-                 prev_a(pagy, a)})
-      pagy.series(**vars).each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
+      prev_a(pagy, a)})
+      pagy.series(**vars).each do |item|
+        # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
         html << case item
                 when Integer
                   a.(item)
@@ -70,6 +72,12 @@ def pagy_t(key, **)
       Pagy::I18n.translate(@pagy_locale ||= nil, key, **)
     end
 
+    # Return a data tag with the base64 encoded JSON-serialized args generated with the faster oj gem
+    def pagy_data(_pagy, *args)
+      data = defined?(::Oj) ? Oj.dump(args, mode: :compat) : JSON.dump(args)
+      %(data-pagy="#{B64.encode(data)}")
+    end
+
     private
 
     def nav_aria_label(pagy, aria_label: nil)
diff --git a/gem/lib/pagy/frontend/javascript.rb b/gem/lib/pagy/frontend/javascript.rb
deleted file mode 100644
index 9cd60301f..000000000
--- a/gem/lib/pagy/frontend/javascript.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../b64'
-require 'json'
-
-class Pagy # :nodoc:
-  module Frontend
-    # Private module documented in the main classes
-    module Javascript
-      # Dummy tag for input helpers: needed because Turbo does not intercept window.location changes
-      A_TAG = '<a href="#" style="display: none;">#</a>'
-
-      # Additions for the Frontend
-      module DataHelpers
-        # Return a data tag with the base64 encoded JSON-serialized args generated with the faster oj gem
-        def pagy_data(_pagy, *args)
-          data = defined?(::Oj) ? Oj.dump(args, mode: :compat) : JSON.dump(args)
-          %(data-pagy="#{B64.encode(data)}")
-        end
-      end
-      Frontend.prepend DataHelpers
-
-      # Additions for the Pagy class
-      module PagyAddOn
-        # `Pagy` instance method used by the `pagy*_nav_js` helpers.
-        # Return the reverse sorted array of widths, series, and labels generated from the :steps hash
-        # Notice: if :steps is false it will use the single {0 => @vars[:size]} size
-        def sequels(steps: @vars[:steps] || { 0 => @vars[:size] }, **_)
-          raise VariableError.new(self, :steps, 'to define the 0 width', steps) unless steps.key?(0)
-
-          widths, series = steps.sort.reverse.map { |width, size| [width, series(size:)] }.transpose
-          [widths, series, label_sequels(series)]
-        end
-
-        # Support for the Calendar API
-        def label_sequels(*); end
-      end
-      Pagy.prepend PagyAddOn
-      Pagy::KeysetForUI.prepend PagyAddOn if defined?(Pagy::KeysetForUI)
-
-      # Additions for Calendar class
-      module CalendarOverride
-        def label_sequels(series)
-          series.map { |s| s.map { |item| item == :gap ? :gap : label_for(item) } }
-        end
-      end
-      Calendar::Unit.prepend CalendarOverride if defined?(::Pagy::Calendar::Unit)
-    end
-  end
-end
diff --git a/gem/lib/pagy/keyset.rb b/gem/lib/pagy/keyset.rb
index d65986f7d..40a6da5a6 100644
--- a/gem/lib/pagy/keyset.rb
+++ b/gem/lib/pagy/keyset.rb
@@ -3,26 +3,29 @@
 
 require 'json'
 require_relative 'b64'
-require_relative 'shared_methods'
-require_relative 'keyset/active_record_adapter'
-require_relative 'keyset/sequel_adapter'
+
+require_relative 'keyset/adapters/active_record'
+require_relative 'keyset/adapters/sequel'
 
 class Pagy
   # Implement wicked-fast keyset pagination for big data
-  class Keyset
+  class Keyset < Pagy
+
+    autoload :Augmented, 'pagy/keyset/augmented'
+
     class TypeError < ::TypeError; end
 
     class ActiveRecord < Keyset
-      include ActiveRecordAdapter
+      include Adapters::ActiveRecord
     end
 
     class Sequel < Keyset
-      include SequelAdapter
+      include Adapters::Sequel
     end
 
     # Pick the right adapter for the set and initilize the right class
     def self.new(set, **vars)
-      if self == Pagy::Keyset || (defined?(::Pagy::KeysetForUI) && self == ::Pagy::KeysetForUI)
+      if self == Pagy::Keyset || (defined?(::Pagy::Keyset::Augmented) && self == ::Pagy::Keyset::Augmented)
         if defined?(::ActiveRecord) && set.is_a?(::ActiveRecord::Relation)
           self::ActiveRecord
         elsif defined?(::Sequel) && set.is_a?(::Sequel::Dataset)
@@ -35,10 +38,8 @@ def self.new(set, **vars)
       end
     end
 
-    include SharedMethods
-
-    def initialize(set, **vars)
-      assign_vars(default, vars)
+    def initialize(set, **vars) # rubocop:disable Lint/MissingSuper
+      assign_vars(vars)
       assign_limit
       @set    = set
       @keyset = vars[:keyset] || extract_keyset
@@ -75,7 +76,7 @@ def assign_page
     #
     #     ("pets"."animal", "pets"."name", "pets"."id") > (:animal, :name, :id)
     #
-    def after_cutoff_sql(prefix = nil)   # prefix is used by the KeysetForUI instances
+    def after_cutoff_sql(prefix = nil)   # prefix is used by the Keyset::Augmented instances
       operator    = { asc: '>', desc: '<' }
       directions  = @keyset.values
       table       = @set.model.table_name
@@ -98,15 +99,6 @@ def after_cutoff_sql(prefix = nil)   # prefix is used by the KeysetForUI instanc
       end
     end
 
-    # Return the Keyset default variables
-    def default
-      default = DEFAULT.slice(:limit, :page_sym,                    # from pagy
-                              :headers,                             # from headers extra
-                              :jsonapi,                             # from jsonapi extra
-                              :limit_sym, :limit_max, :limit_extra) # from limit_extra
-      { **default, page: nil }
-    end
-
     # Derive the cutoff from the last record
     def derive_cutoff
       attr = keyset_attributes_from(@records.last)
diff --git a/gem/lib/pagy/keyset/active_record_adapter.rb b/gem/lib/pagy/keyset/active_record_adapter.rb
deleted file mode 100644
index 7760e6c4d..000000000
--- a/gem/lib/pagy/keyset/active_record_adapter.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# See Pagy API documentation: https://ddnexus.github.io/pagy/docs/api/keyset
-# frozen_string_literal: true
-
-class Pagy
-  class Keyset
-    # Keyset adapter for ActiveRecord
-    module ActiveRecordAdapter
-      # Append the missing keyset keys if the set is restricted by select
-      def apply_select
-        @set.select(*@keyset.keys)
-      end
-
-      # Extract the keyset from the set
-      def extract_keyset
-        @set.order_values.each_with_object({}) do |node, keyset|
-          keyset[node.value.name.to_sym] = node.direction
-        end
-      end
-
-      # Filter the page records
-      def filter_records = @set.where(after_cutoff_sql, **@filter_args)
-
-      # Get the keyset attributes from the record
-      def keyset_attributes_from(record) = record.slice(*@keyset.keys)
-
-      # Set with selected columns?
-      def select? = !@set.select_values.empty?
-
-      # Typecast the cut args
-      def typecast_args(args)
-        @set.model.new(args).slice(args.keys)
-            .to_hash.transform_keys(&:to_sym)
-      end
-    end
-  end
-end
diff --git a/gem/lib/pagy/keyset/adapters/active_record.rb b/gem/lib/pagy/keyset/adapters/active_record.rb
new file mode 100644
index 000000000..4a28c68c4
--- /dev/null
+++ b/gem/lib/pagy/keyset/adapters/active_record.rb
@@ -0,0 +1,38 @@
+# See Pagy API documentation: https://ddnexus.github.io/pagy/docs/api/keyset
+# frozen_string_literal: true
+
+class Pagy
+  class Keyset < Pagy
+    module Adapters
+      # Keyset adapter for ActiveRecord
+      module ActiveRecord
+        # Append the missing keyset keys if the set is restricted by select
+        def apply_select
+          @set.select(*@keyset.keys)
+        end
+
+        # Extract the keyset from the set
+        def extract_keyset
+          @set.order_values.each_with_object({}) do |node, keyset|
+            keyset[node.value.name.to_sym] = node.direction
+          end
+        end
+
+        # Filter the page records
+        def filter_records = @set.where(after_cutoff_sql, **@filter_args)
+
+        # Get the keyset attributes from the record
+        def keyset_attributes_from(record) = record.slice(*@keyset.keys)
+
+        # Set with selected columns?
+        def select? = !@set.select_values.empty?
+
+        # Typecast the cut args
+        def typecast_args(args)
+          @set.model.new(args).slice(args.keys)
+              .to_hash.transform_keys(&:to_sym)
+        end
+      end
+    end
+  end
+end
diff --git a/gem/lib/pagy/keyset/adapters/sequel.rb b/gem/lib/pagy/keyset/adapters/sequel.rb
new file mode 100644
index 000000000..f1cd4ddb6
--- /dev/null
+++ b/gem/lib/pagy/keyset/adapters/sequel.rb
@@ -0,0 +1,51 @@
+# See Pagy API documentation: https://ddnexus.github.io/pagy/docs/api/keyset
+# frozen_string_literal: true
+
+class Pagy
+  class Keyset
+    module Adapters
+      # Keyset adapter for sequel
+      module Sequel
+        # Append the missing keyset keys if the set is restricted by select
+        def apply_select
+          selected = @set.opts[:select]
+          @set.select_append(*@keyset.keys.reject { |c| selected.include?(c) })
+        end
+
+        # Extract the keyset from the set
+        def extract_keyset
+          return {} unless @set.opts[:order]
+
+          @set.opts[:order].each_with_object({}) do |item, keyset|
+            case item
+            when Symbol
+              keyset[item] = :asc
+            when ::Sequel::SQL::OrderedExpression
+              keyset[item.expression] = item.descending ? :desc : :asc
+            else
+              raise TypeError, "#{item.class.inspect} is not a supported Sequel::SQL::OrderedExpression"
+            end
+          end
+        end
+
+        # Filter the page records
+        def filter_records = @set.where(::Sequel.lit(after_cutoff_sql, **@filter_args))
+
+        # Get the keyset attributes from the record
+        def keyset_attributes_from(record) = record.to_hash.slice(*@keyset.keys)
+
+        # Set with selected columns?
+        def select? = !@set.opts[:select].nil?
+
+        # Typecast the cut args
+        def typecast_args(args)
+          model = @set.opts[:model]
+          model.unrestrict_primary_key if (restricted_pk = model.restrict_primary_key?)
+          args = model.new(args).to_hash.slice(*args.keys.map(&:to_sym))
+          model.restrict_primary_key if restricted_pk
+          args
+        end
+      end
+    end
+  end
+end
diff --git a/gem/lib/pagy/keyset/augmented.rb b/gem/lib/pagy/keyset/augmented.rb
new file mode 100644
index 000000000..d0613d113
--- /dev/null
+++ b/gem/lib/pagy/keyset/augmented.rb
@@ -0,0 +1,129 @@
+# See Pagy::Offset::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/keyset_for_ui
+# frozen_string_literal: true
+
+require_relative '../keyset'
+
+class Pagy
+  class Keyset
+    # Use keyset pagination with numeric pages supporting the *nav and other helpers.
+    class Augmented < Keyset
+      class ActiveRecord < Augmented
+        include Adapters::ActiveRecord
+      end
+
+      class Sequel < Augmented
+        include Adapters::Sequel
+      end
+
+      # Avoid args conflicts in composite SQL fragments
+      CUTOFF_PREFIX = 'cutoff_'       # Prefix for filter_args
+      DEFAULT       = { **Keyset::DEFAULT, ends: true, # rubocop:disable Style/MutableConstant
+                                           page: nil,
+                                           size: 7 }
+
+      include SharedUIMethods
+      attr_reader :update
+
+      # Finalize the instance variables needed for the UI
+      def initialize(set, **vars)
+        super
+        # Ensure next is called, so the last page used by the UI helpers is known
+        self.next
+        @prev = @page - 1 unless @page == 1
+        @in   = @records.size
+      end
+
+      # Assign different filter args to support the AFTER_CUTOFF SQL if @cutoff
+      def assign_filter_args
+        return super unless @cutoff
+
+        # Don't prefix the usual filter args for the prev cutoff
+        @filter_args = filter_args_for(@prev_cutoff) if @prev_cutoff
+        # Preserve the cutoff args by prefixing them before merging
+        cutoff_args = filter_args_for(@cutoff).transform_keys { |key| :"#{CUTOFF_PREFIX}#{key}" }
+        (@filter_args ||= {}).merge!(cutoff_args)
+      end
+
+      # Get the augmented page from the client
+      def assign_page
+        if @vars[:page]
+          storage_key, @page, @last, @prev_cutoff, @cutoff = @vars[:page]
+        else
+          @page = @last = 1
+        end
+        @update = [storage_key] # always sent back as-is in order to id the same pagination sequence
+      end
+
+      # Prepare the literal SQL string (complete with the placeholders for value interpolation)
+      # used to filter the page records if the @cutoff is known.
+      #
+      # If the @cutoff is NOT known (i.e. @cutoff.nil?) it will call super
+      # (i.e. the regular keyset business: AFTER PREV_CUTOFF + LIMIT SQL).
+      #
+      # If the @cutoff is known, the LIMIT is replaced with the NOT AFTER CUTOF SQL.
+      # There are two scenarios about the page start, depending on the page number:
+      #
+      # 1. If page == 1
+      #    Pull the inital records and filter them out after the @cutoff
+      #    SQL logic: NOT AFTER CUTOFF
+      #
+      # 2. If page > 1
+      #    Pull the records BETWEEN the @prev_cutoff and the @cutoff,
+      #    (i.e. pull the records AFTER the @prev_cutoff and filter them out after the @cutoff)
+      #    SQL logic: AFTER PREV_CUTOFF AND NOT AFTER CUTOFF
+      #
+      # The AFTER PREV_CUTOFF SQL is like the regular keyset SQL (calling super). For example:
+      # With a set like Pet.order(animal: :asc, name: :desc, id: :asc) it returns the following string:
+      #
+      #    ("pets"."animal" = :animal AND "pets"."name" = :name AND "pets"."id" > :id) OR
+      #    ("pets"."animal" = :animal AND "pets"."name" < :name) OR
+      #    ("pets"."animal" > :animal)
+      #
+      # Notice that the placeholders are not prefixed
+      #
+      # The AFTER CUTOFF SQL is used as a repacement of the SQL LIMIT.
+      # That ensures accuracy in case of records added or removed
+      # Here is how an AFTER CUTOFF looks for the same set:
+      #
+      #    ("pets"."animal" = :cutoff_animal AND "pets"."name" = :cutoff_name AND "pets"."id" > :cutoff_id) OR
+      #    ("pets"."animal" = :cutoff_animal AND "pets"."name" < :cutoff_name) OR
+      #    ("pets"."animal" > :cutoff_animal)
+      #
+      # Notice that the placeholders are prefixed by ":cutoff_" which matches with the arguments prefixed keys
+      def after_cutoff_sql
+        return super unless @cutoff # super for the last known page
+
+        sql = +''
+        # Generate the AFTER PREV_CUTOFF SQL unless @page == 1 (which starts from the fist record in the set)
+        sql << "(#{super}) AND " if @prev_cutoff
+        # Add the AFTER CUTOFF SQL, passing the prefix for the placeholdars
+        sql << "NOT (#{super(CUTOFF_PREFIX)})"
+      end
+
+      # Remove the LIMIT if @cutoff
+      def fetch_records
+        return super unless @cutoff # super for the last known page
+
+        # Disable the LIMIT because it is replaced by the AFTER CUTOFF SQL.
+        # That keeps the fetching accurate also when records are added or removed from a page alredy visited
+        @more = true
+        @set.limit(nil).to_a
+      end
+
+      # Prepare the @update for the client when it's a new page/cutoff and return the next page number
+      def next
+        records
+        return if !@more || (@vars[:max_pages] && @page >= @vars[:max_pages])
+
+        @next ||= begin
+                    unless @cutoff
+                      @cutoff = derive_cutoff
+                      @update << [@page, 1, @cutoff]   # splice arguments for the client cutoffs
+                      @last += 1                       # reflect the added cutoff
+                    end
+                    @page + 1
+                  end
+      end
+    end
+  end
+end
diff --git a/gem/lib/pagy/keyset/sequel_adapter.rb b/gem/lib/pagy/keyset/sequel_adapter.rb
deleted file mode 100644
index 471599af8..000000000
--- a/gem/lib/pagy/keyset/sequel_adapter.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-# See Pagy API documentation: https://ddnexus.github.io/pagy/docs/api/keyset
-# frozen_string_literal: true
-
-class Pagy
-  class Keyset
-    # Keyset adapter for sequel
-    module SequelAdapter
-      # Append the missing keyset keys if the set is restricted by select
-      def apply_select
-        selected = @set.opts[:select]
-        @set.select_append(*@keyset.keys.reject { |c| selected.include?(c) })
-      end
-
-      # Extract the keyset from the set
-      def extract_keyset
-        return {} unless @set.opts[:order]
-
-        @set.opts[:order].each_with_object({}) do |item, keyset|
-          case item
-          when Symbol
-            keyset[item] = :asc
-          when ::Sequel::SQL::OrderedExpression
-            keyset[item.expression] = item.descending ? :desc : :asc
-          else
-            raise TypeError, "#{item.class.inspect} is not a supported Sequel::SQL::OrderedExpression"
-          end
-        end
-      end
-
-      # Filter the page records
-      def filter_records = @set.where(::Sequel.lit(after_cutoff_sql, **@filter_args))
-
-      # Get the keyset attributes from the record
-      def keyset_attributes_from(record) = record.to_hash.slice(*@keyset.keys)
-
-      # Set with selected columns?
-      def select? = !@set.opts[:select].nil?
-
-      # Typecast the cut args
-      def typecast_args(args)
-        model = @set.opts[:model]
-        model.unrestrict_primary_key if (restricted_pk = model.restrict_primary_key?)
-        args = model.new(args).to_hash.slice(*args.keys.map(&:to_sym))
-        model.restrict_primary_key if restricted_pk
-        args
-      end
-    end
-  end
-end
diff --git a/gem/lib/pagy/keyset_for_ui.rb b/gem/lib/pagy/keyset_for_ui.rb
deleted file mode 100644
index d7a2d8695..000000000
--- a/gem/lib/pagy/keyset_for_ui.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-# See Pagy::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/keyset_for_ui
-# frozen_string_literal: true
-
-require_relative 'keyset'
-
-class Pagy # :nodoc:
-  # Use keyset pagination with numeric pages supporting the *nav and other helpers.
-  class KeysetForUI < Keyset
-    class ActiveRecord < KeysetForUI
-      include ActiveRecordAdapter
-    end
-
-    class Sequel < KeysetForUI
-      include SequelAdapter
-    end
-
-    # Avoid args conflicts in composite SQL fragments
-    CUTOFF_PREFIX = 'cutoff_' # Prefix for filter_args
-
-    include SharedUIMethods
-    attr_reader :update
-
-    # Finalize the instance variables needed for the UI
-    def initialize(set, **vars)
-      super
-      # Ensure next is called, so the last page used by the UI helpers is known
-      self.next
-      @prev = @page - 1 unless @page == 1
-      @in   = @records.size
-    end
-
-    # Assign different filter args to support the AFTER_CUTOFF SQL if @cutoff
-    def assign_filter_args
-      return super unless @cutoff
-
-      # Don't prefix the usual filter args for the prev cutoff
-      @filter_args = filter_args_for(@prev_cutoff) if @prev_cutoff
-      # Preserve the cutoff args by prefixing them before merging
-      cutoff_args = filter_args_for(@cutoff).transform_keys { |key| :"#{CUTOFF_PREFIX}#{key}" }
-      (@filter_args ||= {}).merge!(cutoff_args)
-    end
-
-    # Get the augmented page from the client
-    def assign_page
-      if @vars[:page]
-        storage_key, @page, @last, @prev_cutoff, @cutoff = @vars[:page]
-      else
-        @page = @last = 1
-      end
-      @update = [storage_key] # always sent back as-is in order to id the same pagination sequence
-    end
-
-    # Prepare the literal SQL string (complete with the placeholders for value interpolation)
-    # used to filter the page records if the @cutoff is known.
-    #
-    # If the @cutoff is NOT known (i.e. @cutoff.nil?) it will call super
-    # (i.e. the regular keyset business: AFTER PREV_CUTOFF + LIMIT SQL).
-    #
-    # If the @cutoff is known, the LIMIT is replaced with the NOT AFTER CUTOF SQL.
-    # There are two scenarios about the page start, depending on the page number:
-    #
-    # 1. If page == 1
-    #    Pull the inital records and filter them out after the @cutoff
-    #    SQL logic: NOT AFTER CUTOFF
-    #
-    # 2. If page > 1
-    #    Pull the records BETWEEN the @prev_cutoff and the @cutoff,
-    #    (i.e. pull the records AFTER the @prev_cutoff and filter them out after the @cutoff)
-    #    SQL logic: AFTER PREV_CUTOFF AND NOT AFTER CUTOFF
-    #
-    # The AFTER PREV_CUTOFF SQL is like the regular keyset SQL (calling super). For example:
-    # With a set like Pet.order(animal: :asc, name: :desc, id: :asc) it returns the following string:
-    #
-    #    ("pets"."animal" = :animal AND "pets"."name" = :name AND "pets"."id" > :id) OR
-    #    ("pets"."animal" = :animal AND "pets"."name" < :name) OR
-    #    ("pets"."animal" > :animal)
-    #
-    # Notice that the placeholders are not prefixed
-    #
-    # The AFTER CUTOFF SQL is used as a repacement of the SQL LIMIT.
-    # That ensures accuracy in case of records added or removed
-    # Here is how an AFTER CUTOFF looks for the same set:
-    #
-    #    ("pets"."animal" = :cutoff_animal AND "pets"."name" = :cutoff_name AND "pets"."id" > :cutoff_id) OR
-    #    ("pets"."animal" = :cutoff_animal AND "pets"."name" < :cutoff_name) OR
-    #    ("pets"."animal" > :cutoff_animal)
-    #
-    # Notice that the placeholders are prefixed by ":cutoff_" which matches with the arguments prefixed keys
-    def after_cutoff_sql
-      return super unless @cutoff # super for the last known page
-
-      sql = +''
-      # Generate the AFTER PREV_CUTOFF SQL unless @page == 1 (which starts from the fist record in the set)
-      sql << "(#{super}) AND " if @prev_cutoff
-      # Add the AFTER CUTOFF SQL, passing the prefix for the placeholdars
-      sql << "NOT (#{super(CUTOFF_PREFIX)})"
-    end
-
-    # Add the default variables required by the Frontend
-    def default
-      { **super, **DEFAULT.slice(:ends, :size) }
-    end
-
-    # Remove the LIMIT if @cutoff
-    def fetch_records
-      return super unless @cutoff # super for the last known page
-
-      # Disable the LIMIT because it is replaced by the AFTER CUTOFF SQL.
-      # That keeps the fetching accurate also when records are added or removed from a page alredy visited
-      @more = true
-      @set.limit(nil).to_a
-    end
-
-    # Prepare the @update for the client when it's a new page/cutoff and return the next page number
-    def next
-      records
-      return if !@more || (@vars[:max_pages] && @page >= @vars[:max_pages])
-
-      @next ||= begin
-                  unless @cutoff
-                    @cutoff = derive_cutoff
-                    @update << [@page, 1, @cutoff]   # splice arguments for the client cutoffs
-                    @last += 1                       # reflect the added cutoff
-                  end
-                  @page + 1
-                end
-    end
-  end
-end
diff --git a/gem/lib/pagy/mixin/arel.rb b/gem/lib/pagy/mixin/arel.rb
new file mode 100644
index 000000000..2f5b9e0d2
--- /dev/null
+++ b/gem/lib/pagy/mixin/arel.rb
@@ -0,0 +1,31 @@
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/arel
+# frozen_string_literal: true
+
+require_relative 'offset'   # require the offset mixin
+
+class Pagy
+  module OffsetArelMixin
+    module BackendAddOn
+      private
+
+      # Return Pagy object and paginated collection/results
+      def pagy_arel(collection, **vars)
+        vars[:count] ||= pagy_arel_count(collection)
+        pagy_offset(collection, **vars)
+      end
+
+      # Count using Arel when grouping
+      def pagy_arel_count(collection)
+        if collection.group_values.empty?
+          # COUNT(*)
+          collection.count(:all)
+        else
+          # COUNT(*) OVER ()
+          sql = Arel.star.count.over(Arel::Nodes::Grouping.new([]))
+          collection.unscope(:order).pick(sql).to_i
+        end
+      end
+    end
+    Backend.prepend BackendAddOn
+  end
+end
diff --git a/gem/lib/pagy/mixin/array.rb b/gem/lib/pagy/mixin/array.rb
new file mode 100644
index 000000000..87cef7f78
--- /dev/null
+++ b/gem/lib/pagy/mixin/array.rb
@@ -0,0 +1,23 @@
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/array
+# frozen_string_literal: true
+
+require_relative '../offset'
+
+class Pagy
+  module OffsetArrayMixin
+    # Paginate arrays efficiently, avoiding expensive array-wrapping and without overriding
+    module BackendaAddOn
+      private
+
+      # Return Pagy object and paginated items
+      def pagy_array(array, **vars)
+        vars[:count] ||= array.size
+        vars[:limit] ||= pagy_get_limit(vars)
+        vars[:page]  ||= pagy_get_page(vars)
+        pagy = Offset.new(**vars)
+        [pagy, array[pagy.offset, pagy.limit]]
+      end
+    end
+    Backend.prepend BackendaAddOn
+  end
+end
diff --git a/gem/lib/pagy/extras/bootstrap.rb b/gem/lib/pagy/mixin/bootstrap.rb
similarity index 95%
rename from gem/lib/pagy/extras/bootstrap.rb
rename to gem/lib/pagy/mixin/bootstrap.rb
index b28026b04..bca509cba 100644
--- a/gem/lib/pagy/extras/bootstrap.rb
+++ b/gem/lib/pagy/mixin/bootstrap.rb
@@ -1,17 +1,15 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/bootstrap
 # frozen_string_literal: true
 
-require_relative '../frontend/javascript'
-
-class Pagy # :nodoc:
+class Pagy
   # Frontend modules are specially optimized for performance.
   # The resulting code may not look very elegant, but produces the best benchmarks
-  module BootstrapExtra
+  module BootstrapMixin
     # Pagination for bootstrap: it returns the html with the series of links to the pages
     def pagy_bootstrap_nav(pagy, id: nil, classes: 'pagination', aria_label: nil, **vars)
       id   = %( id="#{id}") if id
       a    = pagy_anchor(pagy, **vars)
-      data = %( #{pagy_data(pagy, :n)}) if defined?(::Pagy::KeysetForUI) && pagy.is_a?(KeysetForUI)
+      data = %( #{pagy_data(pagy, :n)}) if defined?(::Pagy::Keyset::Augmented) && pagy.is_a?(Keyset::Augmented)
 
       html = %(<nav#{id} class="pagy-bootstrap nav" #{nav_aria_label(pagy, aria_label:)}#{data
                  }><ul class="#{classes}">#{bootstrap_prev_html(pagy, a)})
@@ -58,7 +56,7 @@ def pagy_bootstrap_combo_nav_js(pagy, id: nil, classes: 'pagination', aria_label
 
       page_input = %(<input name="page" type="number" min="1" max="#{pages}" value="#{pagy.page}" aria-current="page" ) <<
                    %(style="text-align: center; width: #{pages.to_s.length + 1}rem; padding: 0; ) <<
-                   %(border: none; display: inline-block;" class="page-link active">#{Frontend::Javascript::A_TAG})
+                   %(border: none; display: inline-block;" class="page-link active">#{A_TAG})
 
       %(<nav#{id} class="pagy-bootstrap combo-nav-js" #{
           nav_aria_label(pagy, aria_label:)} #{
@@ -94,5 +92,5 @@ def bootstrap_next_html(pagy, a)
       end
     end
   end
-  Frontend.prepend BootstrapExtra
+  Frontend.prepend BootstrapMixin
 end
diff --git a/gem/lib/pagy/extras/bulma.rb b/gem/lib/pagy/mixin/bulma.rb
similarity index 95%
rename from gem/lib/pagy/extras/bulma.rb
rename to gem/lib/pagy/mixin/bulma.rb
index 91c879ea6..b98b3529c 100644
--- a/gem/lib/pagy/extras/bulma.rb
+++ b/gem/lib/pagy/mixin/bulma.rb
@@ -1,18 +1,16 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/bulma
 # frozen_string_literal: true
 
-require_relative '../frontend/javascript'
-
-class Pagy # :nodoc:
+class Pagy
   # Frontend modules are specially optimized for performance.
   # The resulting code may not look very elegant, but produces the best benchmarks
-  module BulmaExtra
+  module BulmaMixin
     # Pagination for bulma: it returns the html with the series of links to the pages
     def pagy_bulma_nav(pagy, id: nil, classes: 'pagy-bulma nav pagination is-centered',
                        aria_label: nil, **vars)
       id   = %( id="#{id}") if id
       a    = pagy_anchor(pagy, **vars)
-      data = %( #{pagy_data(pagy, :n)}) if defined?(::Pagy::KeysetForUI) && pagy.is_a?(KeysetForUI)
+      data = %( #{pagy_data(pagy, :n)}) if defined?(::Pagy::Keyset::Augmented) && pagy.is_a?(Keyset::Augmented)
 
       html = %(<nav#{id} class="#{classes}" #{nav_aria_label(pagy, aria_label:)}#{data}>)
       html << bulma_prev_next_html(pagy, a)
@@ -61,7 +59,7 @@ def pagy_bulma_combo_nav_js(pagy, id: nil, classes: 'pagy-bulma combo-nav-js pag
       page_input = %(<input name="page" type="number" min="1" max="#{pages}" value="#{pagy.page}" aria-current="page") <<
                    %(style="text-align: center; width: #{pages.to_s.length + 1}rem; height: 1.7rem; margin:0 0.3rem; ) <<
                    %(border: none; border-radius: 4px; padding: 0; font-size: 1.1rem; color: white; ) <<
-                   %(background-color: #485fc7;">#{Frontend::Javascript::A_TAG})
+                   %(background-color: #485fc7;">#{A_TAG})
 
       %(<nav#{id} class="#{classes}" #{
           nav_aria_label(pagy, aria_label:)} #{
@@ -90,5 +88,5 @@ def bulma_prev_next_html(pagy, a)
               end
     end
   end
-  Frontend.prepend BulmaExtra
+  Frontend.prepend BulmaMixin
 end
diff --git a/gem/lib/pagy/extras/calendar.rb b/gem/lib/pagy/mixin/calendar.rb
similarity index 84%
rename from gem/lib/pagy/extras/calendar.rb
rename to gem/lib/pagy/mixin/calendar.rb
index d4fbe96ec..35f2816de 100644
--- a/gem/lib/pagy/extras/calendar.rb
+++ b/gem/lib/pagy/mixin/calendar.rb
@@ -1,14 +1,14 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/calendar
 # frozen_string_literal: true
 
-require_relative '../calendar'
+require_relative '../offset/calendar'
 
-class Pagy # :nodoc:
+class Pagy
   # Add pagination filtering by calendar unit (:year, :quarter, :month, :week, :day) to the regular pagination
-  module CalendarExtra
+  module CalendarMixin
     # Additions for the Backend module
     module BackendAddOn
-      CONF_KEYS = (Calendar::UNITS + %i[pagy active]).freeze
+      CONF_KEYS = (Offset::Calendar::UNITS + %i[pagy active]).freeze
 
       private
 
@@ -19,12 +19,12 @@ def pagy_calendar(collection, conf)
 
         conf[:pagy] ||= {}
         unless conf.key?(:active) && !conf[:active]
-          calendar, from, to = Calendar.send(:init, conf, pagy_calendar_period(collection), params) do |unit, period|
+          calendar, from, to = Offset::Calendar.send(:init, conf, pagy_calendar_period(collection), params) do |unit, period|
                                  pagy_calendar_counts(collection, unit, *period) if respond_to?(:pagy_calendar_counts)
                                end
           collection = pagy_calendar_filter(collection, from, to)
         end
-        pagy, results = send(conf[:pagy][:backend] || :pagy, collection, **conf[:pagy])  # use backend: :pagy when omitted
+        pagy, results = send(conf[:pagy][:backend] || :pagy_offset, collection, **conf[:pagy])
         [calendar, pagy, results]
       end
 
@@ -40,6 +40,7 @@ def pagy_calendar_filter(*)
                              '(see https://ddnexus.github.io/pagy/docs/extras/calendar/#pagy-calendar-filter-collection-from-to)'
       end
     end
+    Backend.prepend BackendAddOn
 
     # Override the pagy_anchor
     module FrontendOverride
@@ -65,6 +66,7 @@ def pagy_anchor(pagy, anchor_string: nil)
         end
       end
     end
+    Frontend.prepend FrontendOverride
 
     # Additions for the Frontend module
     module UrlHelperAddOn
@@ -73,7 +75,7 @@ def pagy_calendar_url_at(calendar, time, **)
         pagy_page_url(calendar.send(:calendar_at, time, **), 1, **)
       end
     end
+    Backend.prepend UrlHelperAddOn
+    Frontend.prepend UrlHelperAddOn
   end
-  Backend.prepend CalendarExtra::BackendAddOn, CalendarExtra::UrlHelperAddOn
-  Frontend.prepend CalendarExtra::UrlHelperAddOn, CalendarExtra::FrontendOverride
 end
diff --git a/gem/lib/pagy/mixin/countless.rb b/gem/lib/pagy/mixin/countless.rb
new file mode 100644
index 000000000..e4bdfa30f
--- /dev/null
+++ b/gem/lib/pagy/mixin/countless.rb
@@ -0,0 +1,32 @@
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/countless
+# frozen_string_literal: true
+
+require_relative '../offset/countless'
+
+class Pagy
+  module CountlessMixin
+    # Paginate without the need of any count, saving one query per rendering
+    module BackendAddOn
+      private
+
+      # Return Pagy object and records
+      def pagy_countless(collection, **vars)
+        vars[:limit] ||= pagy_get_limit(vars)
+        vars[:page]  ||= pagy_get_page(vars)
+        pagy = Offset::Countless.new(**vars)
+        [pagy, pagy_countless_get_items(collection, pagy)]
+      end
+
+      # Sub-method called only by #pagy_countless: here for easy customization of record-extraction by overriding
+      # You may need to override this method for collections without offset|limit
+      def pagy_countless_get_items(collection, pagy)
+        return collection.offset(pagy.offset).limit(pagy.limit) if pagy.vars[:countless_minimal]
+
+        fetched = collection.offset(pagy.offset).limit(pagy.limit + 1).to_a # eager load limit + 1
+        pagy.finalize(fetched.size)                                         # finalize the pagy object
+        fetched[0, pagy.limit]                                              # ignore eventual extra item
+      end
+    end
+    Backend.prepend BackendAddOn
+  end
+end
diff --git a/gem/lib/pagy/extras/elasticsearch_rails.rb b/gem/lib/pagy/mixin/elasticsearch_rails.rb
similarity index 77%
rename from gem/lib/pagy/extras/elasticsearch_rails.rb
rename to gem/lib/pagy/mixin/elasticsearch_rails.rb
index 2a7e66834..48e22a06a 100644
--- a/gem/lib/pagy/extras/elasticsearch_rails.rb
+++ b/gem/lib/pagy/mixin/elasticsearch_rails.rb
@@ -1,12 +1,14 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/elasticsearch_rails
 # frozen_string_literal: true
 
-class Pagy # :nodoc:
-  DEFAULT[:elasticsearch_rails_search]      ||= :search
-  DEFAULT[:elasticsearch_rails_pagy_search] ||= :pagy_search
+require_relative '../offset'
+
+class Pagy
+  Offset::DEFAULT[:elasticsearch_rails_search]      ||= :search
+  Offset::DEFAULT[:elasticsearch_rails_pagy_search] ||= :pagy_search
 
   # Paginate ElasticsearchRails response objects
-  module ElasticsearchRailsExtra
+  module ElasticsearchRailsMixin
     module_function
 
     # Get the count from different version of ElasticsearchRails
@@ -28,21 +30,21 @@ def pagy_elasticsearch_rails(query_or_payload, **options)
           args.define_singleton_method(:method_missing) { |*a| args += a }
         end
       end
-      alias_method DEFAULT[:elasticsearch_rails_pagy_search], :pagy_elasticsearch_rails
+      alias_method Offset::DEFAULT[:elasticsearch_rails_pagy_search], :pagy_elasticsearch_rails
     end
     Pagy::ElasticsearchRails = ModelExtension
 
     # Additions for the Pagy class
-    module PagyAddOn
+    module OffsetExtension
       # Create a Pagy object from an Elasticsearch::Model::Response::Response object
       def new_from_elasticsearch_rails(response, **vars)
         vars[:limit] = response.search.options[:size] || 10
         vars[:page]  = ((response.search.options[:from] || 0) / vars[:limit]) + 1
-        vars[:count] = ElasticsearchRailsExtra.total_count(response)
-        Pagy.new(**vars)
+        vars[:count] = ElasticsearchRailsMixin.total_count(response)
+        Offset.new(**vars)
       end
     end
-    Pagy.extend PagyAddOn
+    Offset.extend OffsetExtension
 
     # Add specialized backend methods to paginate ElasticsearchRails searches
     module BackendAddOn
@@ -55,10 +57,10 @@ def pagy_elasticsearch_rails(pagy_search_args, **vars)
         model, query_or_payload, options, *called = pagy_search_args
         options[:size] = vars[:limit]
         options[:from] = vars[:limit] * ((vars[:page] || 1) - 1)
-        response       = model.send(DEFAULT[:elasticsearch_rails_search], query_or_payload, **options)
-        vars[:count]   = ElasticsearchRailsExtra.total_count(response)
+        response       = model.send(Offset::DEFAULT[:elasticsearch_rails_search], query_or_payload, **options)
+        vars[:count]   = ElasticsearchRailsMixin.total_count(response)
 
-        pagy = ::Pagy.new(**vars)
+        pagy = Offset.new(**vars)
         # with :last_page overflow we need to re-run the method in order to get the hits
         return pagy_elasticsearch_rails(pagy_search_args, **vars, page: pagy.page) \
                if defined?(::Pagy::OverflowExtra) && pagy.overflow? && pagy.vars[:overflow] == :last_page
diff --git a/gem/lib/pagy/extras/headers.rb b/gem/lib/pagy/mixin/headers.rb
similarity index 83%
rename from gem/lib/pagy/extras/headers.rb
rename to gem/lib/pagy/mixin/headers.rb
index 3a161983b..03ae47ce7 100644
--- a/gem/lib/pagy/extras/headers.rb
+++ b/gem/lib/pagy/mixin/headers.rb
@@ -3,13 +3,13 @@
 
 require_relative '../url_helpers'
 
-class Pagy # :nodoc:
+class Pagy
   DEFAULT[:headers] = { page:  'current-page',
                         limit: 'page-items',
                         count: 'total-count',
                         pages: 'total-pages' }
   # Add specialized backend methods to add pagination response headers
-  module HeadersExtra
+  module HeadersMixin
     include UrlHelpers
 
     private
@@ -25,8 +25,8 @@ def pagy_headers(pagy)
       pagy_link_header(pagy).tap do |hash|
         hash[headers[:page]]  = pagy.page.to_s if pagy.page && headers[:page]
         hash[headers[:limit]] = pagy.limit.to_s \
-            if headers[:limit] && !(defined?(::Pagy::Calendar) && pagy.is_a?(Calendar::Unit))
-        return hash if (defined?(::Pagy::Countless) && pagy.is_a?(Countless)) || \
+            if headers[:limit] && !(defined?(::Pagy::Offset::Calendar) && pagy.is_a?(Offset::Calendar::Unit))
+        return hash if (defined?(::Pagy::Offset::Countless) && pagy.is_a?(Offset::Countless)) || \
                        (defined?(::Pagy::Keyset) && pagy.is_a?(Keyset))
 
         hash[headers[:pages]] = pagy.last.to_s if headers[:pages]
@@ -46,10 +46,10 @@ def pagy_link_header(pagy)
           link << %(<#{url_str.sub(p, pagy.prev.to_s)}>; rel="prev") if pagy.prev
           link << %(<#{url_str.sub(p, pagy.next.to_s)}>; rel="next") if pagy.next
           link << %(<#{url_str.sub(p, pagy.last.to_s)}>; rel="last") \
-              unless defined?(::Pagy::Countless) && pagy.is_a?(Countless)
+              unless defined?(::Pagy::Offset::Countless) && pagy.is_a?(Offset::Countless)
         end
       end.join(', ') }
     end
   end
-  Backend.prepend HeadersExtra
+  Backend.prepend HeadersMixin
 end
diff --git a/gem/lib/pagy/mixin/keyset.rb b/gem/lib/pagy/mixin/keyset.rb
new file mode 100644
index 000000000..3758d2eb5
--- /dev/null
+++ b/gem/lib/pagy/mixin/keyset.rb
@@ -0,0 +1,32 @@
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/keyset
+# frozen_string_literal: true
+
+require_relative '../keyset'
+
+class Pagy
+  module KeysetMixin
+    # Add backend methods
+    module BackendAddOn
+      private
+
+      # Return Pagy::Keyset object and paginated records
+      def pagy_keyset(set, **vars)
+        vars[:limit] ||= pagy_get_limit(vars)
+        vars[:page]  ||= pagy_get_page(vars, force_integer: false) # allow nil
+        pagy = Keyset.new(set, **vars)
+        [pagy, pagy.records]
+      end
+
+      # Return the URL string for the first page
+      def pagy_keyset_first_url(pagy, **vars)
+        pagy_page_url(pagy, nil, **vars)
+      end
+
+      # Return the URL string for the next page or nil
+      def pagy_keyset_next_url(pagy, **vars)
+        pagy_page_url(pagy, pagy.next, **vars) if pagy.next
+      end
+    end
+    Backend.prepend BackendAddOn
+  end
+end
diff --git a/gem/lib/pagy/mixin/keyset_augmented.rb b/gem/lib/pagy/mixin/keyset_augmented.rb
new file mode 100644
index 000000000..08989d88e
--- /dev/null
+++ b/gem/lib/pagy/mixin/keyset_augmented.rb
@@ -0,0 +1,37 @@
+# See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/keyset_frontendble
+# frozen_string_literal: true
+
+require_relative '../keyset/augmented'
+
+class Pagy
+  module KeysetAugmentedMixin
+    # Add keyset Augmented methods
+    module BackendAddOn
+      # Return Pagy::Keyset::Augmented object and paginated records
+      def pagy_keyset_augmented_js(set, **vars)
+        page = pagy_get_page(vars, force_integer: false) # allow nil
+        if page.to_i.positive?    # numeric page -> no augmentation -> fallback
+          return pagy_countless(set, **vars)
+        elsif page.is_a?(String)  # augmented page param
+          page_args = JSON.parse(B64.urlsafe_decode(page))
+          # Restart the pagination from page 1 if the url has been requested from another browser
+          vars[:page] = page_args if request.cookies['pagy'] == page_args.shift
+        end
+
+        vars[:limit] ||= pagy_get_limit(vars)
+        pagy = Keyset::Augmented.new(set, **vars)
+        [pagy, pagy.records]
+      end
+    end
+    Backend.prepend BackendAddOn
+
+    # Add the arguments for the client to the pagy_data for the *nav helpers
+    module DataHelperOverride
+      def pagy_data(pagy, *args)
+        args.push([pagy.vars[:page_sym], pagy.update]) if pagy.is_a?(::Pagy::Keyset::Augmented) && args[0].to_s.match(/^n/)
+        super
+      end
+    end
+    Frontend.prepend DataHelperOverride
+  end
+end
diff --git a/gem/lib/pagy/extras/meilisearch.rb b/gem/lib/pagy/mixin/meilisearch.rb
similarity index 85%
rename from gem/lib/pagy/extras/meilisearch.rb
rename to gem/lib/pagy/mixin/meilisearch.rb
index cddfcfec3..b211a91a2 100644
--- a/gem/lib/pagy/extras/meilisearch.rb
+++ b/gem/lib/pagy/mixin/meilisearch.rb
@@ -1,12 +1,14 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/meilisearch
 # frozen_string_literal: true
 
-class Pagy # :nodoc:
-  DEFAULT[:meilisearch_search]      ||= :ms_search
-  DEFAULT[:meilisearch_pagy_search] ||= :pagy_search
+require_relative '../offset'
+
+class Pagy
+  Offset::DEFAULT[:meilisearch_search]      ||= :ms_search
+  Offset::DEFAULT[:meilisearch_pagy_search] ||= :pagy_search
 
   # Paginate Meilisearch results
-  module MeilisearchExtra
+  module MeilisearchMixin
     module ModelExtension # :nodoc:
       # Return an array used to delay the call of #search
       # after the pagination variables are merged to the options
@@ -18,7 +20,7 @@ def pagy_meilisearch(query, params = {})
     Pagy::Meilisearch = ModelExtension
 
     # Extension for the Pagy class
-    module PagyExtension
+    module OffsetExtension
       # Create a Pagy object from a Meilisearch results
       def new_from_meilisearch(results, **vars)
         vars[:limit] = results.raw_answer['hitsPerPage']
@@ -28,7 +30,7 @@ def new_from_meilisearch(results, **vars)
         new(**vars)
       end
     end
-    Pagy.extend PagyExtension
+    Offset.extend OffsetExtension
 
     # Add specialized backend methods to paginate Meilisearch results
     module BackendAddOn
@@ -44,7 +46,7 @@ def pagy_meilisearch(pagy_search_args, **vars)
         results                 = model.send(:ms_search, term, options)
         vars[:count]            = results.raw_answer['totalHits']
 
-        pagy                    = ::Pagy.new(**vars)
+        pagy                    = Offset.new(**vars)
         # with :last_page overflow we need to re-run the method in order to get the hits
         return pagy_meilisearch(pagy_search_args, **vars, page: pagy.page) \
                if defined?(::Pagy::OverflowExtra) && pagy.overflow? && pagy.vars[:overflow] == :last_page
diff --git a/gem/lib/pagy/extras/metadata.rb b/gem/lib/pagy/mixin/metadata.rb
similarity index 79%
rename from gem/lib/pagy/extras/metadata.rb
rename to gem/lib/pagy/mixin/metadata.rb
index 591468b28..883a54eb9 100644
--- a/gem/lib/pagy/extras/metadata.rb
+++ b/gem/lib/pagy/mixin/metadata.rb
@@ -3,12 +3,12 @@
 
 require_relative '../url_helpers'
 
-class Pagy # :nodoc:
-  DEFAULT[:metadata] = %i[ url_template first_url prev_url page_url next_url last_url
-                           count page limit vars pages last in from to prev next series ]
+class Pagy
+  DEFAULT[:metadata] = %i[url_template first_url prev_url page_url next_url last_url
+                          count page limit vars pages last in from to prev next series sequels]
 
   # Add a specialized backend method for pagination metadata
-  module MetadataExtra
+  module MetadataMixin
     private
 
     include UrlHelpers
@@ -17,7 +17,7 @@ module MetadataExtra
     def pagy_metadata(pagy, absolute: nil)
       url_template = pagy_page_url(pagy, PAGE_TOKEN, absolute:)
       {}.tap do |metadata|
-        keys = if defined?(::Pagy::Calendar::Unit) && pagy.is_a?(Calendar::Unit)
+        keys = if defined?(::Pagy::Offset::Calendar::Unit) && pagy.is_a?(Offset::Calendar::Unit)
                  pagy.vars[:metadata] - %i[count limit]
                else
                  pagy.vars[:metadata]
@@ -38,5 +38,5 @@ def pagy_metadata(pagy, absolute: nil)
       end
     end
   end
-  Backend.prepend MetadataExtra
+  Backend.prepend MetadataMixin
 end
diff --git a/gem/lib/pagy/mixin/offset.rb b/gem/lib/pagy/mixin/offset.rb
new file mode 100644
index 000000000..11a2460b1
--- /dev/null
+++ b/gem/lib/pagy/mixin/offset.rb
@@ -0,0 +1,31 @@
+# See Pagy::Offset::Backend API documentation: https://ddnexus.github.io/pagy/docs/api/backend
+# frozen_string_literal: true
+
+require_relative '../offset'
+
+class Pagy
+  module OffsetMixin
+    # Define a few generic methods to paginate a collection out of the box,
+    # or any collection by overriding any of the `pagy_*` methods in your controller.
+    # See also the extras if you need specialized methods to paginate Arrays or other collections
+    module BackendAddOn
+      private
+
+      # Return Pagy object and paginated results
+      def pagy_offset(collection, **vars)
+        vars[:count] ||= pagy_get_count(collection, vars)
+        vars[:limit] ||= pagy_get_limit(vars)
+        vars[:page]  ||= pagy_get_page(vars)
+        pagy = Pagy::Offset.new(**vars)
+        [pagy, pagy_get_items(collection, pagy)]
+      end
+
+      # Get the count from the collection
+      def pagy_get_count(collection, vars)
+        count_args = vars[:count_args] || DEFAULT[:count_args]
+        (count     = collection.count(*count_args)).is_a?(Hash) ? count.size : count
+      end
+    end
+    Backend.prepend BackendAddOn
+  end
+end
diff --git a/gem/lib/pagy/extras/pagy.rb b/gem/lib/pagy/mixin/pagy.rb
similarity index 94%
rename from gem/lib/pagy/extras/pagy.rb
rename to gem/lib/pagy/mixin/pagy.rb
index c3ceb1d66..95c3f58bc 100644
--- a/gem/lib/pagy/extras/pagy.rb
+++ b/gem/lib/pagy/mixin/pagy.rb
@@ -1,12 +1,10 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/pagy
 # frozen_string_literal: true
 
-require_relative '../frontend/javascript'
-
-class Pagy # :nodoc:
+class Pagy
   # Frontend modules are specially optimized for performance.
   # The resulting code may not look very elegant, but produces the best benchmarks
-  module PagyExtra
+  module PagyMixin
     # pagy_nav is defined in the Frontend itself
     # Javascript pagination: it returns a nav with a data-pagy attribute used by the pagy.js file
     def pagy_nav_js(pagy, id: nil, aria_label: nil, **vars)
@@ -31,7 +29,7 @@ def pagy_combo_nav_js(pagy, id: nil, aria_label: nil, **vars)
       pages = pagy.pages
 
       page_input = %(<input name="page" type="number" min="1" max="#{pages}" value="#{pagy.page}" aria-current="page" ) <<
-                   %(style="text-align: center; width: #{pages.to_s.length + 1}rem; padding: 0;">#{Frontend::Javascript::A_TAG})
+                   %(style="text-align: center; width: #{pages.to_s.length + 1}rem; padding: 0;">#{A_TAG})
 
       %(<nav#{id} class="pagy combo-nav-js" #{
           nav_aria_label(pagy, aria_label:)} #{
@@ -76,5 +74,5 @@ def pagy_next_link(pagy, **vars)
       %(<link href="#{pagy_page_url(pagy, pagy.next, **vars)}"/>) if pagy.next
     end
   end
-  Frontend.prepend PagyExtra
+  Frontend.prepend PagyMixin
 end
diff --git a/gem/lib/pagy/extras/searchkick.rb b/gem/lib/pagy/mixin/searchkick.rb
similarity index 84%
rename from gem/lib/pagy/extras/searchkick.rb
rename to gem/lib/pagy/mixin/searchkick.rb
index 02248a826..4271e2b33 100644
--- a/gem/lib/pagy/extras/searchkick.rb
+++ b/gem/lib/pagy/mixin/searchkick.rb
@@ -1,12 +1,14 @@
 # See the Pagy documentation: https://ddnexus.github.io/pagy/docs/extras/searchkick
 # frozen_string_literal: true
 
-class Pagy # :nodoc:
-  DEFAULT[:searchkick_search]      ||= :search
-  DEFAULT[:searchkick_pagy_search] ||= :pagy_search
+require_relative '../offset'
+
+class Pagy
+  Offset::DEFAULT[:searchkick_search]      ||= :search
+  Offset::DEFAULT[:searchkick_pagy_search] ||= :pagy_search
 
   # Paginate Searchkick::Results objects
-  module SearchkickExtra
+  module SearchkickMixin
     module ModelExtension # :nodoc:
       # Return an array used to delay the call of #search
       # after the pagination variables are merged to the options.
@@ -16,12 +18,12 @@ def pagy_searchkick(term = '*', **options, &block)
           args.define_singleton_method(:method_missing) { |*a| args += a }
         end
       end
-      alias_method Pagy::DEFAULT[:searchkick_pagy_search], :pagy_searchkick
+      alias_method DEFAULT[:searchkick_pagy_search], :pagy_searchkick
     end
     Pagy::Searchkick = ModelExtension
 
     # Additions for the Pagy class
-    module PagyExtension
+    module OffsetExtension
       # Create a Pagy object from a Searchkick::Results object
       def new_from_searchkick(results, **vars)
         vars[:limit] = results.options[:per_page]
@@ -30,7 +32,7 @@ def new_from_searchkick(results, **vars)
         new(**vars)
       end
     end
-    Pagy.extend PagyExtension
+    Offset.extend OffsetExtension
 
     # Add specialized backend methods to paginate Searchkick::Results
     module BackendAddOn
@@ -46,7 +48,7 @@ def pagy_searchkick(pagy_search_args, **vars)
         results            = model.send(DEFAULT[:searchkick_search], term, **options, &block)
         vars[:count]       = results.total_count
 
-        pagy = ::Pagy.new(**vars)
+        pagy = Offset.new(**vars)
         # with :last_page overflow we need to re-run the method in order to get the hits
         return pagy_searchkick(pagy_search_args, **vars, page: pagy.page) \
                if defined?(::Pagy::OverflowExtra) && pagy.overflow? && pagy.vars[:overflow] == :last_page
diff --git a/gem/lib/pagy/offset.rb b/gem/lib/pagy/offset.rb
new file mode 100644
index 000000000..531a5def6
--- /dev/null
+++ b/gem/lib/pagy/offset.rb
@@ -0,0 +1,70 @@
+# See Pagy::Offset API documentation: https://ddnexus.github.io/pagy/docs/api/pagy/offset
+# frozen_string_literal: true
+
+class Pagy
+  # Implements Offset Pagination
+  class Offset < Pagy
+    autoload :Calendar,  'pagy/offset/calendar'
+    autoload :Countless, 'pagy/offset/countless'
+
+    # Core default: constant for easy access, but mutable for customizable defaults
+    DEFAULT = { count_args: [:all],  # AR friendly # rubocop:disable Style/MutableConstant
+                ends:       true,
+                outset:     0,
+                page:       1,
+                size:       7 }
+
+    attr_reader :count, :from, :next, :offset, :to
+
+    # Merge and validate the options, do some simple arithmetic and set the instance variables
+    def initialize(**vars) # rubocop:disable Lint/MissingSuper
+      assign_vars(vars)
+      assign_and_check(count: 0, page: 1, outset: 0)
+      assign_limit
+      assign_offset
+      assign_last
+      check_overflow
+      @from = [@offset - @outset + 1, @count].min
+      @to   = [@offset - @outset + @limit, @count].min
+      @in   = [@to - @from + 1, @count].min
+      assign_prev_and_next
+    end
+
+    # Setup @last (overridden by the gearbox extra)
+    def assign_last
+      @last = [(@count.to_f / @limit).ceil, 1].max
+      @last = @vars[:max_pages] if @vars[:max_pages] && @last > vars[:max_pages]
+    end
+
+    # Assign @offset (overridden by the gearbox extra)
+    def assign_offset
+      @offset = (@limit * (@page - 1)) + @outset  # may be already set from gear_box
+    end
+
+    # Assign @prev and @next
+    def assign_prev_and_next
+      @prev = (@page - 1 unless @page == 1)
+      @next = @page == @last ? (1 if @vars[:cycle]) : @page + 1
+    end
+
+    # Checks the @page <= @last
+    def check_overflow
+      return unless @page > @last
+
+      @overflow = true
+      case @vars[:overflow]
+      when :last_page
+        requested_page = @vars[:page]                # save the requested page (even after re-run)
+        initialize(**vars, page: @last)              # re-run with the last page
+        @vars[:page] = requested_page                # restore the requested page
+      when :empty_page
+        @in = @from = @to = 0                        # vars relative to the actual page
+        @page = @prev = @last                        # @prev relative to the actual page, @page for full series without current
+      else
+        raise OverflowError.new(self, :page, "in 1..#{@last}", @page)
+      end
+    end
+
+    include SharedUIMethods
+  end
+end
diff --git a/gem/lib/pagy/offset/calendar.rb b/gem/lib/pagy/offset/calendar.rb
new file mode 100644
index 000000000..0a9f6dd77
--- /dev/null
+++ b/gem/lib/pagy/offset/calendar.rb
@@ -0,0 +1,86 @@
+# See Pagy::Offset::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/calendar
+# frozen_string_literal: true
+
+require_relative '../offset'
+
+class Pagy
+  class Offset
+    # Calendar class
+    class Calendar < Hash
+      # Specific out of range error
+      class OutOfRangeError < VariableError; end
+
+      # List of units in desc order of duration. It can be used for custom units.
+      UNITS = %i[year quarter month week day]  # rubocop:disable Style/MutableConstant
+
+      class << self
+        private
+
+        # Create a unit subclass instance by using the unit name (internal use)
+        def create(unit, **vars)
+          raise InternalError, "unit must be in #{UNITS.inspect}; got #{unit}" unless UNITS.include?(unit)
+
+          name    = +unit.to_s
+          name[0] = name[0].capitalize
+          Object.const_get("Pagy::Offset::Calendar::#{name}").new(**vars)
+        end
+
+        # Return calendar, from, to
+        def init(...)
+          new.send(:init, ...)
+        end
+      end
+
+      # Return the current time of the smallest time unit shown
+      def showtime
+        self[@units.last].from
+      end
+
+      private
+
+      # Create the calendar
+      def init(conf, period, params)
+        @conf  = Marshal.load(Marshal.dump(conf))  # store a copy
+        @units = Calendar::UNITS & @conf.keys # get the units in time length desc order
+        raise ArgumentError, 'no calendar unit found in pagy_calendar @configuration' if @units.empty?
+
+        @period   = period
+        @params   = params
+        @page_sym = conf[:pagy][:page_sym] || Pagy::DEFAULT[:page_sym]
+        # set all the :page_sym vars for later deletion
+        @units.each { |unit| conf[unit][:page_sym] = :"#{unit}_#{@page_sym}" }
+        calendar = {}
+        object   = nil
+        @units.each_with_index do |unit, index|
+          params_to_delete    = @units[(index + 1), @units.size].map { |sub| conf[sub][:page_sym] } + [@page_sym]
+          conf[unit][:params] = ->(up) { up.except(*params_to_delete.map(&:to_s)) }
+          conf[unit][:period] = object&.send(:active_period) || @period
+          conf[unit][:page]   = @params[:"#{unit}_#{@page_sym}"] # requested page
+          # :nocov:
+          conf[unit][:counts] = yield(unit, conf[unit][:period]) if block_given?  # nocov doesn't need to fail block_given?
+          # :nocov:
+          calendar[unit]      = object \
+                              = Calendar.send(:create, unit, **conf[unit])
+        end
+        [replace(calendar), object.from, object.to]
+      end
+
+      # Return the calendar object at time
+      def calendar_at(time, **opts)
+        conf      = Marshal.load(Marshal.dump(@conf))
+        page_syms = {}
+        @units.inject(nil) do |object, unit|
+          conf[unit][:period] = object&.send(:active_period) || @period
+          conf[unit][:page]   = page_syms[:"#{unit}_#{@page_sym}"] \
+                              = Calendar.send(:create, unit, **conf[unit]).send(:page_at, time, **opts)
+          conf[unit][:params] ||= {}
+          conf[unit][:params].merge!(page_syms)
+          Calendar.send(:create, unit, **conf[unit])
+        end
+      end
+    end
+  end
+end
+
+# Require the subclass files in UNITS (no custom unit at this point yet)
+Pagy::Offset::Calendar::UNITS.each { |unit| require "pagy/offset/calendar/#{unit}" }
diff --git a/gem/lib/pagy/offset/calendar/day.rb b/gem/lib/pagy/offset/calendar/day.rb
new file mode 100644
index 000000000..40ddfe795
--- /dev/null
+++ b/gem/lib/pagy/offset/calendar/day.rb
@@ -0,0 +1,45 @@
+# See Pagy::Offset::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/calendar
+# frozen_string_literal: true
+
+require_relative 'unit'
+
+class Pagy
+  class Offset
+    class Calendar
+      # Day unit subclass
+      class Day < Unit
+        DEFAULT = { size:   31, # rubocop:disable Style/MutableConstant
+                    ends: false,
+                    order:  :asc,
+                    format: '%d' }
+
+        protected
+
+        # Set up the calendar variables
+        def assign_unit_vars
+          super
+          @initial = @starting.beginning_of_day
+          @final   = @ending.tomorrow.beginning_of_day
+          @last    = page_offset(@initial, @final)
+          @from    = starting_time_for(@page)
+          @to      = @from.tomorrow
+        end
+
+        # Starting time for the page
+        def starting_time_for(page)
+          @initial.days_since(time_offset_for(page))
+        end
+
+        def page_offset_at(time)
+          page_offset(@initial, time.beginning_of_day)
+        end
+
+        private
+
+        def page_offset(time_a, time_b)  # remove in 6.0
+          (time_b.time - time_a.time).to_i / 1.day
+        end
+      end
+    end
+  end
+end
diff --git a/gem/lib/pagy/offset/calendar/month.rb b/gem/lib/pagy/offset/calendar/month.rb
new file mode 100644
index 000000000..546559517
--- /dev/null
+++ b/gem/lib/pagy/offset/calendar/month.rb
@@ -0,0 +1,46 @@
+# See Pagy::Offset::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/calendar
+# frozen_string_literal: true
+
+require_relative 'unit'
+
+class Pagy # :nodoc:
+  class Offset
+    class Calendar # :nodoc:
+      # Month unit subclass
+      class Month < Unit
+        DEFAULT = { size:   12,   # rubocop:disable Style/MutableConstant
+                    ends:   false,
+                    order:  :asc,
+                    format: '%b' }
+
+        protected
+
+        # Set up the calendar variables
+        def assign_unit_vars
+          super
+          @initial = @starting.beginning_of_month
+          @final   = @ending.next_month.beginning_of_month
+          @last    = (months_in(@final) - months_in(@initial))
+          @from    = starting_time_for(@page)
+          @to      = @from.next_month
+        end
+
+        # Starting time for the page
+        def starting_time_for(page)
+          @initial.months_since(time_offset_for(page))
+        end
+
+        def page_offset_at(time)
+          months_in(time.beginning_of_month) - months_in(@initial)
+        end
+
+        private
+
+        # Number of months in time
+        def months_in(time)
+          (time.year * 12) + time.month
+        end
+      end
+    end
+  end
+end
diff --git a/gem/lib/pagy/offset/calendar/quarter.rb b/gem/lib/pagy/offset/calendar/quarter.rb
new file mode 100644
index 000000000..f8356b972
--- /dev/null
+++ b/gem/lib/pagy/offset/calendar/quarter.rb
@@ -0,0 +1,53 @@
+# See Pagy::Offset::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/calendar
+# frozen_string_literal: true
+
+require_relative 'unit'
+
+class Pagy # :nodoc:
+  class Offset
+    class Calendar # :nodoc:
+      # Quarter unit subclass
+      class Quarter < Unit
+        DEFAULT = { size:   4,      # rubocop:disable Style/MutableConstant
+                    ends:   false,
+                    order:  :asc,
+                    format: 'Q%q' } # '%q' token
+
+        # The label for any page, with the substitution of the '%q' token
+        def label_for(page, opts = {})
+          starting_time = starting_time_for(page.to_i)  # page could be a string
+          opts[:format] = (opts[:format] || @vars[:format]).gsub('%q') { (starting_time.month / 3.0).ceil }
+          localize(starting_time, opts)
+        end
+
+        protected
+
+        # Set up the calendar variables
+        def assign_unit_vars
+          super
+          @initial = @starting.beginning_of_quarter
+          @final   = @ending.next_quarter.beginning_of_quarter
+          @last    = (months_in(@final) - months_in(@initial)) / 3
+          @from    = starting_time_for(@page)
+          @to      = @from.next_quarter
+        end
+
+        # Starting time for the page
+        def starting_time_for(page)
+          @initial.months_since(time_offset_for(page) * 3)
+        end
+
+        def page_offset_at(time)
+          (months_in(time.beginning_of_quarter) - months_in(@initial)) / 3
+        end
+
+        private
+
+        # Number of months in time
+        def months_in(time)
+          (time.year * 12) + time.month
+        end
+      end
+    end
+  end
+end
diff --git a/gem/lib/pagy/offset/calendar/unit.rb b/gem/lib/pagy/offset/calendar/unit.rb
new file mode 100644
index 000000000..5f7d81b16
--- /dev/null
+++ b/gem/lib/pagy/offset/calendar/unit.rb
@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+require 'active_support'
+require 'active_support/core_ext/time'
+require 'active_support/core_ext/date_and_time/calculations'
+require 'active_support/core_ext/numeric/time'
+require 'active_support/core_ext/integer/time'
+
+class Pagy
+  class Offset
+    class Calendar
+      # Base class for time units subclasses (Year, Quarter, Month, Week, Day)
+      class Unit < Offset
+        attr_reader :order, :from, :to
+
+        # Merge and validate the options, do some simple arithmetic and set a few instance variables
+        def initialize(**vars)    # rubocop:disable Lint/MissingSuper
+          raise InternalError, 'Pagy::Offset::Calendar::Unit is a base class; use one of its subclasses' \
+              if instance_of?(Pagy::Offset::Calendar::Unit)
+
+          assign_vars(vars)
+          assign_and_check(page: 1)
+          assign_unit_vars
+          check_overflow
+          assign_prev_and_next
+        end
+
+        # Override if :empty_page
+        def check_overflow
+          super unless @vars[:overflow] == :empty_page
+
+          @overflow = true
+          @in = @from = @to = 0                        # vars relative to the actual page
+          edge = @order == :asc ? @final : @initial    # get the edge of the overflow side (neat, but any time would do)
+          @from = @to = edge                           # set both to the edge time (a >=&&< query will get no records)
+        end
+
+        # The label for the current page (it can pass along the I18n gem opts when it's used with the i18n extra)
+        def label(opts = {})
+          label_for(@page, opts)
+        end
+
+        # The label for any page (it can pass along the I18n gem opts when it's used with the i18n extra)
+        def label_for(page, opts = {})
+          opts[:format] ||= @vars[:format]
+          localize(starting_time_for(page.to_i), opts)  # page could be a string
+        end
+
+        protected
+
+        def label_sequels(series)
+          series.map { |s| s.map { |item| item == :gap ? :gap : label_for(item) } }
+        end
+
+        # The page that includes time
+        # In case of out of range time, the :fit_time option avoids the outOfRangeError
+        # and returns the closest page to the passed time argument (first or last page)
+        def page_at(time, **opts)
+          fit_time  = time
+          fit_final = @final - 1
+          unless time.between?(@initial, fit_final)
+            raise OutOfRangeError.new(self, :time, "between #{@initial} and #{fit_final}", time) unless opts[:fit_time]
+
+            if time < @final
+              fit_time = @initial
+              ordinal  = 'first'
+            else
+              fit_time = fit_final
+              ordinal  = 'last'
+            end
+            warn "Pagy::Offset::Calendar#page_at: Rescued #{time} out of range by returning the #{ordinal} page."
+          end
+          offset = page_offset_at(fit_time)   # offset starts from 0
+          @order == :asc ? offset + 1 : @last - offset
+        end
+
+        # Base class method for the setup of the unit variables (subclasses must implement it and call super)
+        def assign_unit_vars
+          raise VariableError.new(self, :format, 'to be a strftime format', @vars[:format]) unless @vars[:format].is_a?(String)
+          raise VariableError.new(self, :order, 'to be in [:asc, :desc]', @order) \
+          unless %i[asc desc].include?(@order = @vars[:order])
+
+          @starting, @ending = @vars[:period]
+          raise VariableError.new(self, :period, 'to be a an Array of min and max TimeWithZone instances', @vars[:period]) \
+          unless @starting.is_a?(ActiveSupport::TimeWithZone) \
+          && @ending.is_a?(ActiveSupport::TimeWithZone) && @starting <= @ending
+        end
+
+        # Apply the strftime format to the time (overridden by the i18n extra when localization is required)
+        def localize(time, opts)
+          time.strftime(opts[:format])
+        end
+
+        # Number of time units to offset from the @initial time, in order to get the ordered starting time for the page.
+        # Used in starting_time_for(page) where page starts from 1 (e.g. page to starting_time means subtracting 1)
+        def time_offset_for(page)
+          @order == :asc ? page - 1 : @last - page
+        end
+
+        # Period of the active page (used internally for nested units)
+        def active_period
+          [[@starting, @from].max, [@to - 1, @ending].min] # -1 sec: include only last unit day
+        end
+
+        # :nocov:
+        # This method must be implemented by the unit subclass
+        def starting_time_for(*)
+          raise NoMethodError, 'the starting_time_for method must be implemented by the unit subclass'
+        end
+
+        # This method must be implemented by the unit subclass
+        def page_offset_at(*)
+          raise NoMethodError, 'the page_offset_at method must be implemented by the unit subclass'
+        end
+        # :nocov:
+      end
+    end
+  end
+end
diff --git a/gem/lib/pagy/offset/calendar/week.rb b/gem/lib/pagy/offset/calendar/week.rb
new file mode 100644
index 000000000..04a543f7e
--- /dev/null
+++ b/gem/lib/pagy/offset/calendar/week.rb
@@ -0,0 +1,43 @@
+# See Pagy::Offset::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/calendar
+# frozen_string_literal: true
+
+require_relative 'unit'
+
+class Pagy
+  class Offset
+    class Calendar
+      # Week unit subclass
+      class Week < Unit
+        DEFAULT  = { order:  :asc, # rubocop:disable Style/MutableConstant
+                     format: '%Y-%W' }
+
+        protected
+
+        # Set up the calendar variables
+        def assign_unit_vars
+          super
+          @initial = @starting.beginning_of_week
+          @final   = @ending.next_week.beginning_of_week
+          @last    = page_offset(@initial, @final)
+          @from    = starting_time_for(@page)
+          @to      = @from.next_week
+        end
+
+        # Starting time for the page
+        def starting_time_for(page)
+          @initial.weeks_since(time_offset_for(page))
+        end
+
+        def page_offset_at(time)
+          page_offset(@initial, time.beginning_of_week)
+        end
+
+        private
+
+        def page_offset(time_a, time_b)  # remove in 6.0
+          (time_b.time - time_a.time).to_i / 1.week
+        end
+      end
+    end
+  end
+end
diff --git a/gem/lib/pagy/offset/calendar/year.rb b/gem/lib/pagy/offset/calendar/year.rb
new file mode 100644
index 000000000..6a92292c6
--- /dev/null
+++ b/gem/lib/pagy/offset/calendar/year.rb
@@ -0,0 +1,39 @@
+# See Pagy::Offset::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/calendar
+# frozen_string_literal: true
+
+require_relative 'unit'
+
+class Pagy # :nodoc:
+  class Offset
+    class Calendar # :nodoc:
+      # Year unit subclass
+      class Year < Unit
+        DEFAULT = { size:   10,   # rubocop:disable Style/MutableConstant
+                    ends:   false,
+                    order:  :asc,
+                    format: '%Y' }
+
+        protected
+
+        # Set up the calendar variables
+        def assign_unit_vars
+          super
+          @initial = @starting.beginning_of_year
+          @final   = @ending.next_year.beginning_of_year
+          @last    = @final.year - @initial.year
+          @from    = starting_time_for(@page)
+          @to      = @from.next_year
+        end
+
+        # Starting time for the page
+        def starting_time_for(page)
+          @initial.years_since(time_offset_for(page))
+        end
+
+        def page_offset_at(time)
+          time.beginning_of_year.year - @initial.year
+        end
+      end
+    end
+  end
+end
diff --git a/gem/lib/pagy/offset/countless.rb b/gem/lib/pagy/offset/countless.rb
new file mode 100644
index 000000000..ae5149614
--- /dev/null
+++ b/gem/lib/pagy/offset/countless.rb
@@ -0,0 +1,54 @@
+# See Pagy::Offset::Countless API documentation: https://ddnexus.github.io/pagy/docs/api/offset/countless
+# frozen_string_literal: true
+
+require_relative '../offset'
+
+class Pagy
+  class Offset
+    # No need to know the count to paginate
+    class Countless < Offset
+      DEFAULT[:countless_minimal] = false
+
+      # Merge and validate the options, do some simple arithmetic and set a few instance variables
+      def initialize(**vars) # rubocop:disable Lint/MissingSuper
+        assign_vars(vars)
+        assign_and_check(page: 1, outset: 0)
+        assign_limit
+        assign_offset
+      end
+
+      # Finalize the instance variables based on the fetched size
+      def finalize(fetched_size)
+        raise OverflowError.new(self, :page, "to be < #{@page}", @page) if fetched_size.zero? && @page > 1
+
+        @last = fetched_size > @limit ? @page + 1 : @page
+        @last = @vars[:max_pages] if @vars[:max_pages] && @last > @vars[:max_pages]
+        raise OverflowError.new(self, :page, "in 1..#{@last}", @page) if @page > @last
+
+        @in   = [fetched_size, @limit].min
+        @from = @in.zero? ? 0 : @offset - @outset + 1
+        @to   = @offset - @outset + @in
+        assign_prev_and_next
+        self
+      rescue OverflowError
+        @overflow = true
+        if @vars[:overflow] == :empty_page
+          @offset      = @limit = @from = @to = 0 # vars relative to the actual page
+          @vars[:size] = 0 # no page in the series
+          self
+        else
+          raise
+        end
+      end
+    end
+
+    module SeriesOverride # :nodoc:
+      # Override the original series.
+      # Return nil if :countless_minimal is enabled
+      def series(**)
+        super unless @vars[:countless_minimal]
+      end
+    end
+    prepend SeriesOverride
+  end
+end
diff --git a/gem/lib/pagy/shared_methods.rb b/gem/lib/pagy/shared_methods.rb
deleted file mode 100644
index 4e76305f4..000000000
--- a/gem/lib/pagy/shared_methods.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-class Pagy
-  # Shared with Keyset
-  module SharedMethods
-    attr_reader :page, :limit, :vars
-
-    # Validates and assign the passed vars: var must be present and value.to_i must be >= to min
-    def assign_and_check(name_min)
-      name_min.each do |name, min|
-        raise VariableError.new(self, name, ">= #{min}", @vars[name]) \
-              unless @vars[name]&.respond_to?(:to_i) && instance_variable_set(:"@#{name}", @vars[name].to_i) >= min
-      end
-    end
-
-    # Assign @limit (overridden by the gearbox extra)
-    def assign_limit
-      assign_and_check(limit: 1)
-    end
-
-    # Assign @vars
-    def assign_vars(default, vars)
-      @vars = { **default, **vars.delete_if { |k, v| default.key?(k) && (v.nil? || v == '') } }
-    end
-  end
-
-  # Shared with KeysetForUI
-  module SharedUIMethods
-    attr_reader :in, :last, :prev
-    alias pages last
-
-    # Label for the current page. Allow the customization of the output (overridden by the calendar extra)
-    def label = @page.to_s
-
-    # Label for any page. Allow the customization of the output (overridden by the calendar extra)
-    def label_for(page) = page.to_s
-
-    # Return the array of page numbers and :gap e.g. [1, :gap, 8, "9", 10, :gap, 36]
-    def series(size: @vars[:size], **_)
-      raise VariableError.new(self, :size, 'to be an Integer >= 0', size) \
-      unless size.is_a?(Integer) && size >= 0
-      return [] if size.zero?
-
-      [].tap do |series|
-        if size >= @last
-          series.push(*1..@last)
-        else
-          left  = ((size - 1) / 2.0).floor             # left half might be 1 page shorter for even size
-          start = if @page <= left                     # beginning pages
-                    1
-                  elsif @page > (@last - size + left)  # end pages
-                    @last - size + 1
-                  else                                 # intermediate pages
-                    @page - left
-                  end
-          series.push(*start...start + size)
-          # Set first and last pages plus gaps when needed, respecting the size
-          if vars[:ends] && size >= 7
-            series[0]  = 1
-            series[1]  = :gap  unless series[1]  == 2
-            series[-2] = :gap  unless series[-2] == @last - 1
-            series[-1] = @last
-          end
-        end
-        series[series.index(@page)] = @page.to_s
-      end
-    end
-  end
-end
diff --git a/gem/pagy.gemspec b/gem/pagy.gemspec
index 6fa02ac4b..b2c08da8f 100644
--- a/gem/pagy.gemspec
+++ b/gem/pagy.gemspec
@@ -19,5 +19,6 @@ Gem::Specification.new do |s|
                     'changelog_uri'         => 'https://github.com/ddnexus/pagy/blob/master/CHANGELOG.md',
                     'support'               => 'https://github.com/ddnexus/pagy/discussions/categories/q-a' }
   s.executables << 'pagy'
+  s.add_dependency 'json'
   s.required_ruby_version = '>= 3.2'
 end
diff --git a/src/pagy.ts b/src/pagy.ts
index 362a8120f..cefdc2555 100644
--- a/src/pagy.ts
+++ b/src/pagy.ts
@@ -91,7 +91,7 @@ const Pagy = (() => {
   // Return a random key: 3 chars max, base-36 number < 36**3
   const randKey = () => Math.floor(Math.random() * 36 ** 3).toString(36);
 
-  // Init for KeysetForUI paginated navs
+  // Init for Keyset::Augmented paginated navs
   const initNavKeyset = async (nav:HTMLElement, [pageSym, [storageKey, spliceArgs]]:NavKeysetArgs) => {
     if (!storageSupport) { return }
 
diff --git a/test/helpers/nav_tests.rb b/test/helpers/nav_tests.rb
index 6ab23e53b..03f57a0d6 100644
--- a/test/helpers/nav_tests.rb
+++ b/test/helpers/nav_tests.rb
@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
-require 'pagy/extras/countless'
-require 'pagy/extras/keyset_for_ui'
 require_relative '../mock_helpers/pagy_buggy'
 require_relative '../mock_helpers/app'
 require_relative '../files/models'
+require 'pagy/offset'
+require 'pagy/offset/countless'
+require 'pagy/keyset/augmented'
 
 module NavTests
   def app
@@ -14,39 +15,39 @@ def app
   def nav_tests(prefix)
     method = :"pagy#{prefix}_nav"
     [1, 20, 50].each do |page|
-      pagy  = Pagy.new(count: 1000, page: page)
-      pagyx = Pagy.new(count: 1000, page: page)
+      pagy  = Pagy::Offset.new(count: 1000, page: page)
+      pagyx = Pagy::Offset.new(count: 1000, page: page)
       _(app.send(method, pagy)).must_rematch :"plain_#{page}"
       _(app.send(method, pagyx, id: 'test-nav-id', anchor_string: 'anchor_string')).must_rematch :"extras_#{page}"
     end
     _ { app.send(method, PagyBuggy.new(count: 100)) }.must_raise Pagy::InternalError
-    pagyk = Pagy::KeysetForUI.new(Pet.order(:animal, :name, :id),
-                                  page: ['key', 2, 2, ["cat", "Ella", 18], nil])
+    pagyk = Pagy::Keyset::Augmented.new(Pet.order(:animal, :name, :id),
+                                        page: ['key', 2, 2, ["cat", "Ella", 18], nil])
     _(app.send(method, pagyk)).must_rematch :keyset
   end
 
   def nav_js_tests(prefix)  # e.g. pagy_bootstrap_nav_js
     method = :"pagy#{prefix}_nav_js"
     [1, 20, 50].each do |page|
-      pagy = Pagy.new(count: 1000, page: page)
-      pagyx = Pagy.new(count: 1000, page: page)
+      pagy = Pagy::Offset.new(count: 1000, page: page)
+      pagyx = Pagy::Offset.new(count: 1000, page: page)
       _(app.send(method, pagy)).must_rematch :"plain_#{page}"
       _(app.send(method, pagyx, id: 'test-nav-id', anchor_string: 'anchor_string',
                         steps: { 0 => 5, 600 => 7 })).must_rematch :"extras_#{page}"
     end
     # raise Pagy::VariableError for missing 0 step
-    pagy = Pagy.new(count: 1000, page: 20, steps: { 0 => 5, 600 => 7 })
+    pagy = Pagy::Offset.new(count: 1000, page: 20, steps: { 0 => 5, 600 => 7 })
     _ { app.send(method, pagy, steps: { 600 => 7 }) }.must_raise Pagy::VariableError
-    pagyk = Pagy::KeysetForUI.new(Pet.order(:animal, :name, :id),
-                                  page: ['key', 2, 2, ["cat", "Ella", 18], nil])
+    pagyk = Pagy::Keyset::Augmented.new(Pet.order(:animal, :name, :id),
+                                        page: ['key', 2, 2, ["cat", "Ella", 18], nil])
     _(app.send(method, pagyk)).must_rematch :keyset
   end
 
   def nav_js_countless_tests(prefix)  # e.g. pagy_bootstrap_nav_js
     method = :"pagy#{prefix}_nav_js"
     [[1, 0], [2, 23]].each do |page, rest|
-      pagy = Pagy::Countless.new(page: page).finalize(rest)
-      pagyx = Pagy::Countless.new(page: page).finalize(rest)
+      pagy = Pagy::Offset::Countless.new(page: page).finalize(rest)
+      pagyx = Pagy::Offset::Countless.new(page: page).finalize(rest)
       _(app.send(method, pagy)).must_rematch :"plain_#{page}_#{rest}"
       _(app.send(method, pagyx, id: 'test-nav-id', anchor_string: 'anchor_string',
                  steps: { 0 => 5, 600 => 7 })).must_rematch :"extras_#{page}_#{rest}"
@@ -56,8 +57,8 @@ def nav_js_countless_tests(prefix)  # e.g. pagy_bootstrap_nav_js
   def combo_nav_js_tests(prefix)
     method = :"pagy#{prefix}_combo_nav_js"
     [1, 3, 6].each do |page|
-      pagy = Pagy.new(count: 103, page: page)
-      pagyx = Pagy.new(count: 103, page: page)
+      pagy = Pagy::Offset.new(count: 103, page: page)
+      pagyx = Pagy::Offset.new(count: 103, page: page)
       _(app.send(method, pagy)).must_rematch :"plain_#{page}"
       _(app.send(method, pagyx, id: 'test-nav-id', anchor_string: 'anchor_string')).must_rematch :"extras_#{page}"
     end
diff --git a/test/mock_helpers/elasticsearch_rails.rb b/test/mock_helpers/elasticsearch_rails.rb
index 1f4e3f9e6..ca67db32e 100644
--- a/test/mock_helpers/elasticsearch_rails.rb
+++ b/test/mock_helpers/elasticsearch_rails.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'pagy/extras/elasticsearch_rails'
-
 module MockElasticsearchRails
   RESULTS = { 'a' => ('a-1'..'a-1000').to_a,
               'b' => ('b-1'..'b-1000').to_a }.freeze
diff --git a/test/mock_helpers/pagy_buggy.rb b/test/mock_helpers/pagy_buggy.rb
index 242b26122..5cae2793b 100644
--- a/test/mock_helpers/pagy_buggy.rb
+++ b/test/mock_helpers/pagy_buggy.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-class PagyBuggy < Pagy
+require 'pagy/offset'
+class PagyBuggy < Pagy::Offset
   # buggy series
   def series(_size = @vars[:size])
     [1, 2, "3", true, false]
diff --git a/test/pagy/backend_test.rb b/test/pagy/backend_test.rb
index 652fa38b3..554463594 100644
--- a/test/pagy/backend_test.rb
+++ b/test/pagy/backend_test.rb
@@ -13,8 +13,8 @@
       @collection = MockCollection.new
     end
     it 'paginates with defaults' do
-      pagy, records = app.send(:pagy, @collection)
-      _(pagy).must_be_instance_of Pagy
+      pagy, records = app.send(:pagy_offset, @collection)
+      _(pagy).must_be_instance_of Pagy::Offset
       _(pagy.count).must_equal 1000
       _(pagy.limit).must_equal Pagy::DEFAULT[:limit]
       _(pagy.page).must_equal app.params[:page].to_i
@@ -23,7 +23,7 @@
     end
     it 'paginates with vars' do
       pagy, records = app.send(:pagy, @collection, page: 2, limit: 10, anchor_string: 'X')
-      _(pagy).must_be_instance_of Pagy
+      _(pagy).must_be_instance_of Pagy::Offset
       _(pagy.count).must_equal 1000
       _(pagy.limit).must_equal pagy.limit
       _(pagy.page).must_equal 2
@@ -87,7 +87,7 @@
   describe '#pagy_get_items' do
     it 'gets items' do
       collection = MockCollection.new
-      pagy       = Pagy.new count: 1000
+      pagy       = Pagy::Offset.new count: 1000
       records    = app.send :pagy_get_items, collection, pagy
       _(records).must_equal [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
     end
diff --git a/test/pagy/calendar_dst_test.rb b/test/pagy/calendar_dst_test.rb
index 00e12f46d..1e4e2ae66 100644
--- a/test/pagy/calendar_dst_test.rb
+++ b/test/pagy/calendar_dst_test.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../test_helper'
-require 'pagy/calendar'
+require 'pagy/offset/calendar'
 
 Time.zone = "Pacific Time (US & Canada)"
 Date.beginning_of_week = :sunday
@@ -11,25 +11,25 @@
     it 'calculates the last label out of DST' do
       starting = Time.zone.local(2022, 3, 1, 3)   # PST
       ending   = Time.zone.local(2022, 3, 10, 3)  # PST
-      p = Pagy::Calendar.send(:create, :day, format: '%Y-%m-%d', period: [starting, ending])
+      p = Pagy::Offset::Calendar.send(:create, :day, format: '%Y-%m-%d', period: [starting, ending])
       _(p.label_for(p.last)).must_equal "2022-03-10"
     end
     it 'calculates the last label entering DST' do
       starting = Time.zone.local(2022, 3, 10, 3)  # PST
       ending   = Time.zone.local(2022, 3, 20, 3)  # PDT
-      p = Pagy::Calendar.send(:create, :day, format: '%Y-%m-%d', period: [starting, ending])
+      p = Pagy::Offset::Calendar.send(:create, :day, format: '%Y-%m-%d', period: [starting, ending])
       _(p.label_for(p.last)).must_equal "2022-03-20"
     end
     it 'calculates the last label in DST' do
       starting = Time.zone.local(2022, 10, 1, 3)   # PDT
       ending   = Time.zone.local(2022, 10, 10, 3)  # PDT
-      p = Pagy::Calendar.send(:create, :day, format: '%Y-%m-%d', period: [starting, ending])
+      p = Pagy::Offset::Calendar.send(:create, :day, format: '%Y-%m-%d', period: [starting, ending])
       _(p.label_for(p.last)).must_equal "2022-10-10"
     end
     it 'calculates the last label exiting DST' do
       starting = Time.zone.local(2022, 11, 1, 3)   # PDT
       ending   = Time.zone.local(2022, 11, 10, 3)  # PST
-      p = Pagy::Calendar.send(:create, :day, format: '%Y-%m-%d', period: [starting, ending])
+      p = Pagy::Offset::Calendar.send(:create, :day, format: '%Y-%m-%d', period: [starting, ending])
       _(p.label_for(p.last)).must_equal "2022-11-10"
     end
   end
@@ -38,25 +38,25 @@
     it 'calculates the last label out of DST' do
       starting = Time.zone.local(2022, 3, 1, 3)   # PST
       ending   = Time.zone.local(2022, 3, 10, 3)  # PST
-      p = Pagy::Calendar.send(:create, :week, period: [starting, ending])
+      p = Pagy::Offset::Calendar.send(:create, :week, period: [starting, ending])
       _(p.label_for(p.last)).must_equal "2022-09"
     end
     it 'calculates the last label entering DST' do
       starting = Time.zone.local(2022, 3, 10, 3)  # PST
       ending   = Time.zone.local(2022, 3, 21, 3)  # PDT
-      p = Pagy::Calendar.send(:create, :week, period: [starting, ending])
+      p = Pagy::Offset::Calendar.send(:create, :week, period: [starting, ending])
       _(p.label_for(p.last)).must_equal "2022-11"
     end
     it 'calculates the last label in DST' do
       starting = Time.zone.local(2022, 10, 1, 3)   # PDT
       ending   = Time.zone.local(2022, 10, 10, 3)  # PDT
-      p = Pagy::Calendar.send(:create, :week, period: [starting, ending])
+      p = Pagy::Offset::Calendar.send(:create, :week, period: [starting, ending])
       _(p.label_for(p.last)).must_equal "2022-40"
     end
     it 'calculates the last label exiting DST' do
       starting = Time.zone.local(2022, 11, 1, 3)   # PDT
       ending   = Time.zone.local(2022, 11, 10, 3)  # PST
-      p = Pagy::Calendar.send(:create, :week, period: [starting, ending])
+      p = Pagy::Offset::Calendar.send(:create, :week, period: [starting, ending])
       _(p.label_for(p.last)).must_equal "2022-44"
     end
   end
@@ -65,25 +65,25 @@
     it 'calculates the last label out of DST' do
       starting = Time.zone.local(2021, 12, 3, 3)   # PST
       ending   = Time.zone.local(2022, 2, 10, 3)  # PST
-      p = Pagy::Calendar.send(:create, :month, format: '%Y-%m', period: [starting, ending])
+      p = Pagy::Offset::Calendar.send(:create, :month, format: '%Y-%m', period: [starting, ending])
       _(p.label_for(p.last)).must_equal "2022-02"
     end
     it 'calculates the last label entering DST' do
       starting = Time.zone.local(2022, 2, 10, 3)  # PST
       ending   = Time.zone.local(2022, 4, 21, 3)  # PDT  W
-      p = Pagy::Calendar.send(:create, :month, format: '%Y-%m', period: [starting, ending])
+      p = Pagy::Offset::Calendar.send(:create, :month, format: '%Y-%m', period: [starting, ending])
       _(p.label_for(p.last)).must_equal "2022-04"
     end
     it 'calculates the last label in DST' do
       starting = Time.zone.local(2022, 7, 1, 3)   # PDT
       ending   = Time.zone.local(2022, 9, 10, 3)  # PDT
-      p = Pagy::Calendar.send(:create, :month, format: '%Y-%m', period: [starting, ending])
+      p = Pagy::Offset::Calendar.send(:create, :month, format: '%Y-%m', period: [starting, ending])
       _(p.label_for(p.last)).must_equal "2022-09"
     end
     it 'calculates the last label exiting DST' do
       starting = Time.zone.local(2022, 9, 10, 3)   # PDT
       ending   = Time.zone.local(2022, 11, 10, 3)  # PST
-      p = Pagy::Calendar.send(:create, :month, format: '%Y-%m', period: [starting, ending])
+      p = Pagy::Offset::Calendar.send(:create, :month, format: '%Y-%m', period: [starting, ending])
       _(p.label_for(p.last)).must_equal "2022-11"
     end
   end
@@ -92,25 +92,25 @@
     it 'calculates the last label out of DST' do
       starting = Time.zone.local(2022, 1, 3, 3)  # PST
       ending   = Time.zone.local(2022, 2, 10, 3)  # PST
-      p = Pagy::Calendar.send(:create, :quarter, format: '%Y-Q%q', period: [starting, ending])
+      p = Pagy::Offset::Calendar.send(:create, :quarter, format: '%Y-Q%q', period: [starting, ending])
       _(p.label_for(p.last)).must_equal "2022-Q1"
     end
     it 'calculates the last label entering DST' do
       starting = Time.zone.local(2022, 2, 10, 3)  # PST
       ending   = Time.zone.local(2022, 4, 21, 3)  # PDT  W
-      p = Pagy::Calendar.send(:create, :quarter, format: '%Y-Q%q', period: [starting, ending])
+      p = Pagy::Offset::Calendar.send(:create, :quarter, format: '%Y-Q%q', period: [starting, ending])
       _(p.label_for(p.last)).must_equal "2022-Q2"
     end
     it 'calculates the last label in DST' do
       starting = Time.zone.local(2022, 7, 1, 3)   # PDT
       ending   = Time.zone.local(2022, 9, 10, 3)  # PDT
-      p = Pagy::Calendar.send(:create, :quarter, format: '%Y-Q%q', period: [starting, ending])
+      p = Pagy::Offset::Calendar.send(:create, :quarter, format: '%Y-Q%q', period: [starting, ending])
       _(p.label_for(p.last)).must_equal "2022-Q3"
     end
     it 'calculates the last label exiting DST' do
       starting = Time.zone.local(2022, 9, 10, 3)   # PDT
       ending   = Time.zone.local(2022, 11, 10, 3)  # PST
-      p = Pagy::Calendar.send(:create, :quarter, format: '%Y-Q%q', period: [starting, ending])
+      p = Pagy::Offset::Calendar.send(:create, :quarter, format: '%Y-Q%q', period: [starting, ending])
       _(p.label_for(p.last)).must_equal "2022-Q4"
     end
   end
diff --git a/test/pagy/calendar_test.rb b/test/pagy/calendar_test.rb
index a39385683..fad1084b6 100644
--- a/test/pagy/calendar_test.rb
+++ b/test/pagy/calendar_test.rb
@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 require_relative '../test_helper'
-require 'pagy/calendar'
+require 'pagy/offset/calendar'
 
 Time.zone = 'EST'
 Date.beginning_of_week = :sunday
 
 def pagy(unit: :month, **vars)
   default = { period: [Time.zone.local(2021, 10, 21, 13, 18, 23, 0), Time.zone.local(2023, 11, 13, 15, 43, 40, 0)] }
-  Pagy::Calendar.send(:create, unit, **default, **vars)
+  Pagy::Offset::Calendar.send(:create, unit, **default, **vars)
 end
 
 describe 'pagy/calendar' do
@@ -266,7 +266,7 @@ def pagy(unit: :month, **vars)
       end
     end
     it 'raises direct instantiation' do
-      _ { Pagy::Calendar::Unit.new }.must_raise Pagy::InternalError
+      _ { Pagy::Offset::Calendar::Unit.new }.must_raise Pagy::InternalError
     end
   end
 
@@ -279,8 +279,8 @@ def pagy(unit: :month, **vars)
       _(p.send(:page_at, Time.zone.local(2023, 11, 13, 15, 43, 40, 0))).must_equal 3
       _(p.send(:page_at, Time.zone.local(2100), fit_time: true)).must_equal 3
       _(p.send(:page_at, Time.zone.local(2000), fit_time: true)).must_equal 1
-      _ { p.send(:page_at, Time.zone.local(2100)) }.must_raise Pagy::Calendar::OutOfRangeError
-      _ { p.send(:page_at, Time.zone.local(2000)) }.must_raise Pagy::Calendar::OutOfRangeError
+      _ { p.send(:page_at, Time.zone.local(2100)) }.must_raise Pagy::Offset::Calendar::OutOfRangeError
+      _ { p.send(:page_at, Time.zone.local(2000)) }.must_raise Pagy::Offset::Calendar::OutOfRangeError
     end
     it 'returns the page number for :year desc' do
       p = pagy(unit: :year, order: :desc)
@@ -289,8 +289,8 @@ def pagy(unit: :month, **vars)
       _(p.send(:page_at, Time.zone.local(2023, 11, 13, 15, 43, 40, 0))).must_equal 1
       _(p.send(:page_at, Time.zone.local(2100), fit_time: true)).must_equal 1
       _(p.send(:page_at, Time.zone.local(2000), fit_time: true)).must_equal 3
-      _ { p.send(:page_at, Time.zone.local(2100)) }.must_raise Pagy::Calendar::OutOfRangeError
-      _ { p.send(:page_at, Time.zone.local(2000)) }.must_raise Pagy::Calendar::OutOfRangeError
+      _ { p.send(:page_at, Time.zone.local(2100)) }.must_raise Pagy::Offset::Calendar::OutOfRangeError
+      _ { p.send(:page_at, Time.zone.local(2000)) }.must_raise Pagy::Offset::Calendar::OutOfRangeError
     end
 
     it 'returns the page number for :quarter' do
@@ -300,8 +300,8 @@ def pagy(unit: :month, **vars)
       _(p.send(:page_at, Time.zone.local(2023, 11, 13, 15, 43, 40, 0))).must_equal 9
       _(p.send(:page_at, Time.zone.local(2100), fit_time: true)).must_equal 9
       _(p.send(:page_at, Time.zone.local(2000), fit_time: true)).must_equal 1
-      _ { p.send(:page_at, Time.zone.local(2100)) }.must_raise Pagy::Calendar::OutOfRangeError
-      _ { p.send(:page_at, Time.zone.local(2000)) }.must_raise Pagy::Calendar::OutOfRangeError
+      _ { p.send(:page_at, Time.zone.local(2100)) }.must_raise Pagy::Offset::Calendar::OutOfRangeError
+      _ { p.send(:page_at, Time.zone.local(2000)) }.must_raise Pagy::Offset::Calendar::OutOfRangeError
     end
     it 'returns the page number for :quarter desc' do
       p = pagy(unit: :quarter, order: :desc)
@@ -310,8 +310,8 @@ def pagy(unit: :month, **vars)
       _(p.send(:page_at, Time.zone.local(2023, 11, 13, 15, 43, 40, 0))).must_equal 1
       _(p.send(:page_at, Time.zone.local(2100), fit_time: true)).must_equal 1
       _(p.send(:page_at, Time.zone.local(2000), fit_time: true)).must_equal 9
-      _ { p.send(:page_at, Time.zone.local(2100)) }.must_raise Pagy::Calendar::OutOfRangeError
-      _ { p.send(:page_at, Time.zone.local(2000)) }.must_raise Pagy::Calendar::OutOfRangeError
+      _ { p.send(:page_at, Time.zone.local(2100)) }.must_raise Pagy::Offset::Calendar::OutOfRangeError
+      _ { p.send(:page_at, Time.zone.local(2000)) }.must_raise Pagy::Offset::Calendar::OutOfRangeError
     end
     it 'returns the page number for :month' do
       p = pagy(unit: :month)
@@ -320,8 +320,8 @@ def pagy(unit: :month, **vars)
       _(p.send(:page_at, Time.zone.local(2023, 11, 13, 15, 43, 40, 0))).must_equal 26
       _(p.send(:page_at, Time.zone.local(2100), fit_time: true)).must_equal 26
       _(p.send(:page_at, Time.zone.local(2000), fit_time: true)).must_equal 1
-      _ { p.send(:page_at, Time.zone.local(2100)) }.must_raise Pagy::Calendar::OutOfRangeError
-      _ { p.send(:page_at, Time.zone.local(2000)) }.must_raise Pagy::Calendar::OutOfRangeError
+      _ { p.send(:page_at, Time.zone.local(2100)) }.must_raise Pagy::Offset::Calendar::OutOfRangeError
+      _ { p.send(:page_at, Time.zone.local(2000)) }.must_raise Pagy::Offset::Calendar::OutOfRangeError
     end
     it 'returns the page number for :month desc' do
       p = pagy(unit: :month, order: :desc)
@@ -330,8 +330,8 @@ def pagy(unit: :month, **vars)
       _(p.send(:page_at, Time.zone.local(2023, 11, 13, 15, 43, 40, 0))).must_equal 1
       _(p.send(:page_at, Time.zone.local(2100), fit_time: true)).must_equal 1
       _(p.send(:page_at, Time.zone.local(2000), fit_time: true)).must_equal 26
-      _ { p.send(:page_at, Time.zone.local(2100)) }.must_raise Pagy::Calendar::OutOfRangeError
-      _ { p.send(:page_at, Time.zone.local(2000)) }.must_raise Pagy::Calendar::OutOfRangeError
+      _ { p.send(:page_at, Time.zone.local(2100)) }.must_raise Pagy::Offset::Calendar::OutOfRangeError
+      _ { p.send(:page_at, Time.zone.local(2000)) }.must_raise Pagy::Offset::Calendar::OutOfRangeError
     end
 
     it 'returns the page number for :week' do
@@ -341,8 +341,8 @@ def pagy(unit: :month, **vars)
       _(p.send(:page_at, Time.zone.local(2023, 11, 13))).must_equal 109
       _(p.send(:page_at, Time.zone.local(2100), fit_time: true)).must_equal 109
       _(p.send(:page_at, Time.zone.local(2000), fit_time: true)).must_equal 1
-      _ { p.send(:page_at, Time.zone.local(2100)) }.must_raise Pagy::Calendar::OutOfRangeError
-      _ { p.send(:page_at, Time.zone.local(2000)) }.must_raise Pagy::Calendar::OutOfRangeError
+      _ { p.send(:page_at, Time.zone.local(2100)) }.must_raise Pagy::Offset::Calendar::OutOfRangeError
+      _ { p.send(:page_at, Time.zone.local(2000)) }.must_raise Pagy::Offset::Calendar::OutOfRangeError
     end
     it 'returns the page number for :week desc' do
       p = pagy(unit: :week, order: :desc)
@@ -351,8 +351,8 @@ def pagy(unit: :month, **vars)
       _(p.send(:page_at, Time.zone.local(2023, 11, 13))).must_equal 1
       _(p.send(:page_at, Time.zone.local(2100), fit_time: true)).must_equal 1
       _(p.send(:page_at, Time.zone.local(2000), fit_time: true)).must_equal 109
-      _ { p.send(:page_at, Time.zone.local(2100)) }.must_raise Pagy::Calendar::OutOfRangeError
-      _ { p.send(:page_at, Time.zone.local(2000)) }.must_raise Pagy::Calendar::OutOfRangeError
+      _ { p.send(:page_at, Time.zone.local(2100)) }.must_raise Pagy::Offset::Calendar::OutOfRangeError
+      _ { p.send(:page_at, Time.zone.local(2000)) }.must_raise Pagy::Offset::Calendar::OutOfRangeError
     end
     it 'returns the page number for :day' do
       p = pagy(unit: :day)
@@ -361,8 +361,8 @@ def pagy(unit: :month, **vars)
       _(p.send(:page_at, Time.zone.local(2023, 11, 13))).must_equal 754
       _(p.send(:page_at, Time.zone.local(2100), fit_time: true)).must_equal 754
       _(p.send(:page_at, Time.zone.local(2000), fit_time: true)).must_equal 1
-      _ { p.send(:page_at, Time.zone.local(2100)) }.must_raise Pagy::Calendar::OutOfRangeError
-      _ { p.send(:page_at, Time.zone.local(2000)) }.must_raise Pagy::Calendar::OutOfRangeError
+      _ { p.send(:page_at, Time.zone.local(2100)) }.must_raise Pagy::Offset::Calendar::OutOfRangeError
+      _ { p.send(:page_at, Time.zone.local(2000)) }.must_raise Pagy::Offset::Calendar::OutOfRangeError
     end
     it 'returns the page number for :day desc' do
       p = pagy(unit: :day, order: :desc)
@@ -371,8 +371,8 @@ def pagy(unit: :month, **vars)
       _(p.send(:page_at, Time.zone.local(2023, 11, 13))).must_equal 1
       _(p.send(:page_at, Time.zone.local(2100), fit_time: true)).must_equal 1
       _(p.send(:page_at, Time.zone.local(2000), fit_time: true)).must_equal 754
-      _ { p.send(:page_at, Time.zone.local(2100)) }.must_raise Pagy::Calendar::OutOfRangeError
-      _ { p.send(:page_at, Time.zone.local(2000)) }.must_raise Pagy::Calendar::OutOfRangeError
+      _ { p.send(:page_at, Time.zone.local(2100)) }.must_raise Pagy::Offset::Calendar::OutOfRangeError
+      _ { p.send(:page_at, Time.zone.local(2000)) }.must_raise Pagy::Offset::Calendar::OutOfRangeError
     end
   end
 
diff --git a/test/pagy/countless_test.rb b/test/pagy/countless_test.rb
index 2325b7644..7dd428b40 100644
--- a/test/pagy/countless_test.rb
+++ b/test/pagy/countless_test.rb
@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
 require_relative '../test_helper'
-require 'pagy/extras/countless'
 
 describe 'pagy/countless' do
   describe '#finalize' do
     it 'initializes empty collection' do
-      pagy, = Pagy::Countless.new(page: 1)
+      pagy, = Pagy::Offset::Countless.new(page: 1)
       pagy.finalize(0)
       _(pagy.count).must_be_nil
       _(pagy.limit).must_equal 20
@@ -19,10 +18,10 @@
       _(pagy.next).must_be_nil
     end
     it 'initializes first page' do
-      pagy, = Pagy::Countless.new(page: 1)
+      pagy, = Pagy::Offset::Countless.new(page: 1)
       pagy.finalize(21) # one more page
       _(pagy.count).must_be_nil
-      _(pagy).must_be_instance_of Pagy::Countless
+      _(pagy).must_be_instance_of Pagy::Offset::Countless
       _(pagy.limit).must_equal 20
       _(pagy.last).must_equal 2
       _(pagy.in).must_equal 20
@@ -32,7 +31,7 @@
       _(pagy.next).must_equal 2
     end
     it 'initializes single full page' do
-      pagy, = Pagy::Countless.new(page: 1)
+      pagy, = Pagy::Offset::Countless.new(page: 1)
       pagy.finalize(20) # no more page - last full
       _(pagy.count).must_be_nil
       _(pagy.limit).must_equal 20
@@ -44,7 +43,7 @@
       _(pagy.next).must_be_nil
     end
     it 'initialize single partial page' do
-      pagy, = Pagy::Countless.new(page: 1)
+      pagy, = Pagy::Offset::Countless.new(page: 1)
       pagy.finalize(4) # partial page of 4 - also last
       _(pagy.count).must_be_nil
       _(pagy.limit).must_equal 20
@@ -56,7 +55,7 @@
       _(pagy.next).must_be_nil
     end
     it 'initializes last partial page' do
-      pagy, = Pagy::Countless.new(page: 3)
+      pagy, = Pagy::Offset::Countless.new(page: 3)
       pagy.finalize(19) # partial page of 4 - also last
       _(pagy.count).must_be_nil
       _(pagy.limit).must_equal 20
@@ -68,7 +67,7 @@
       _(pagy.next).must_be_nil
     end
     it 'handles the :cycle variable' do
-      pagy, = Pagy::Countless.new(page: 3, cycle: true)
+      pagy, = Pagy::Offset::Countless.new(page: 3, cycle: true)
       pagy.finalize(19) # partial page of 4 - also last
       _(pagy.count).must_be_nil
       _(pagy.limit).must_equal 20
@@ -80,7 +79,7 @@
       _(pagy.next).must_equal 1
     end
     it 'raises exception with no fetched records and page > 1' do
-      _ { Pagy::Countless.new(page: 2, overflow: :exception).finalize(0) }.must_raise Pagy::OverflowError
+      _ { Pagy::Offset::Countless.new(page: 2, overflow: :exception).finalize(0) }.must_raise Pagy::OverflowError
     end
   end
 end
diff --git a/test/pagy/exceptions_test.rb b/test/pagy/exceptions_test.rb
index cbe686146..28e102d2f 100644
--- a/test/pagy/exceptions_test.rb
+++ b/test/pagy/exceptions_test.rb
@@ -7,28 +7,28 @@
   describe '#variable and #value' do
     it 'raises for non overflow pages' do
       begin
-        Pagy.new(count: 1, page: 0)
+        Pagy::Offset.new(count: 1, page: 0)
       rescue Pagy::VariableError => e
         _(e.variable).must_equal :page
         _(e.value).must_equal 0
       end
 
       begin
-        Pagy.new(count: 1, page: -10)
+        Pagy::Offset.new(count: 1, page: -10)
       rescue Pagy::VariableError => e
         _(e.variable).must_equal :page
         _(e.value).must_equal(-10)
       end
 
       begin
-        Pagy.new(count: 1, page: 'string')
+        Pagy::Offset.new(count: 1, page: 'string')
       rescue Pagy::VariableError => e
         _(e.variable).must_equal :page
         _(e.value).must_equal 'string'
       end
 
       begin
-        Pagy.new(count: 1, page: {})
+        Pagy::Offset.new(count: 1, page: {})
       rescue Pagy::VariableError => e
         _(e.variable).must_equal :page
         _(e.value).must_equal({})
@@ -36,20 +36,20 @@
     end
 
     it 'raises for other variables' do
-      Pagy.new(count: -10)
+      Pagy::Offset.new(count: -10)
     rescue Pagy::VariableError => e
       _(e.variable).must_equal :count
       _(e.value).must_equal(-10)
     end
     it 'rescues as ArgumentError' do
-      Pagy.new(count: 1, page: -10)
+      Pagy::Offset.new(count: 1, page: -10)
     rescue ArgumentError => e
       _(e.variable).must_equal :page
       _(e.value).must_equal(-10)
     end
     it 'does not raise for :count and :offset set to arbitrary strings (converted to 0)' do
-      pagy = Pagy.new(count: 'string', outset: 'string')
-      _(pagy).must_be_instance_of Pagy
+      pagy = Pagy::Offset.new(count: 'string', outset: 'string')
+      _(pagy).must_be_instance_of Pagy::Offset
       _(pagy.count).must_equal 0
       _(pagy.instance_variable_get(:@outset)).must_equal 0
     end
diff --git a/test/pagy/extras/arel_test.rb b/test/pagy/extras/arel_test.rb
index 373078808..2701c946b 100644
--- a/test/pagy/extras/arel_test.rb
+++ b/test/pagy/extras/arel_test.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative '../../test_helper'
-require 'pagy/extras/arel'
 
 require_relative '../../mock_helpers/arel'
 require_relative '../../mock_helpers/collection'
@@ -16,7 +15,7 @@
     end
     it 'paginates with defaults' do
       pagy, records = app.send(:pagy_arel, @collection)
-      _(pagy).must_be_instance_of Pagy
+      _(pagy).must_be_instance_of Pagy::Offset
       _(pagy.count).must_equal 1000
       _(pagy.limit).must_equal Pagy::DEFAULT[:limit]
       _(pagy.page).must_equal app.params[:page].to_i
@@ -25,7 +24,7 @@
     end
     it 'paginates with vars' do
       pagy, records = app.send(:pagy_arel, @collection, page: 2, limit: 10, anchor_string: 'X')
-      _(pagy).must_be_instance_of Pagy
+      _(pagy).must_be_instance_of Pagy::Offset
       _(pagy.count).must_equal 1000
       _(pagy.limit).must_equal 10
       _(pagy.page).must_equal 2
diff --git a/test/pagy/extras/array_test.rb b/test/pagy/extras/array_test.rb
index ecb3ee835..164738463 100644
--- a/test/pagy/extras/array_test.rb
+++ b/test/pagy/extras/array_test.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative '../../test_helper'
-require 'pagy/extras/array'
 
 require_relative '../../mock_helpers/app'
 
@@ -14,7 +13,7 @@
     end
     it 'paginates with defaults' do
       pagy, records = app.send(:pagy_array, @collection)
-      _(pagy).must_be_instance_of Pagy
+      _(pagy).must_be_instance_of Pagy::Offset
       _(pagy.count).must_equal 1000
       _(pagy.limit).must_equal Pagy::DEFAULT[:limit]
       _(pagy.page).must_equal app.params[:page].to_i
@@ -23,7 +22,7 @@
     end
     it 'paginates with vars' do
       pagy, records = app.send(:pagy_array, @collection, page: 2, limit: 10, anchor_string: 'X')
-      _(pagy).must_be_instance_of Pagy
+      _(pagy).must_be_instance_of Pagy::Offset
       _(pagy.count).must_equal 1000
       _(pagy.limit).must_equal 10
       _(pagy.page).must_equal 2
diff --git a/test/pagy/extras/bootstrap_test.rb b/test/pagy/extras/bootstrap_test.rb
index 69016bacc..b67bb5765 100644
--- a/test/pagy/extras/bootstrap_test.rb
+++ b/test/pagy/extras/bootstrap_test.rb
@@ -5,7 +5,7 @@
 
 EXTRA  = 'bootstrap'
 PREFIX = '_bootstrap'
-require "pagy/extras/#{EXTRA}"
+
 
 describe "pagy/extras/#{EXTRA}" do
   include NavTests
@@ -17,7 +17,7 @@
   end
 
   describe "#pagy#{PREFIX}_nav_js" do
-    it 'renders single and multiple pages when used with Pagy::Countless' do
+    it 'renders single and multiple pages when used with Pagy::Offset::Countless' do
       nav_js_countless_tests(PREFIX)
     end
     it 'renders first, intermediate and last pages with required steps' do
diff --git a/test/pagy/extras/bootstrap_test.rb.yaml b/test/pagy/extras/bootstrap_test.rb.yaml
index 861a5149a..83bca1267 100644
--- a/test/pagy/extras/bootstrap_test.rb.yaml
+++ b/test/pagy/extras/bootstrap_test.rb.yaml
@@ -139,3 +139,10 @@ pagy/extras/bootstrap___pagy_bootstrap_nav_js_test_0001_renders_single_and_multi
   :plain_2_23: <nav class="pagy-bootstrap nav-js" aria-label="Pages" data-pagy="WyJuaiIsWyI8dWwgY2xhc3M9XCJwYWdpbmF0aW9uXCI+PGxpIGNsYXNzPVwicGFnZS1pdGVtIHByZXZcIj48YSBocmVmPVwiL2Zvbz9wYWdlPTFcIiBjbGFzcz1cInBhZ2UtbGlua1wiIGFyaWEtbGFiZWw9XCJQcmV2aW91c1wiPiZsdDs8L2E+PC9saT4iLCI8bGkgY2xhc3M9XCJwYWdlLWl0ZW1cIj48YSBocmVmPVwiL2Zvbz9wYWdlPVAgXCIgY2xhc3M9XCJwYWdlLWxpbmtcIj5MPC9hPjwvbGk+IiwiPGxpIGNsYXNzPVwicGFnZS1pdGVtIGFjdGl2ZVwiPjxhIHJvbGU9XCJsaW5rXCIgY2xhc3M9XCJwYWdlLWxpbmtcIiBhcmlhLWN1cnJlbnQ9XCJwYWdlXCIgYXJpYS1kaXNhYmxlZD1cInRydWVcIj5MPC9hPjwvbGk+IiwiPGxpIGNsYXNzPVwicGFnZS1pdGVtIGdhcCBkaXNhYmxlZFwiPjxhIHJvbGU9XCJsaW5rXCIgY2xhc3M9XCJwYWdlLWxpbmtcIiBhcmlhLWRpc2FibGVkPVwidHJ1ZVwiPiZoZWxsaXA7PC9hPjwvbGk+IiwiPGxpIGNsYXNzPVwicGFnZS1pdGVtIG5leHRcIj48YSBocmVmPVwiL2Zvbz9wYWdlPTNcIiBjbGFzcz1cInBhZ2UtbGlua1wiIGFyaWEtbGFiZWw9XCJOZXh0XCI+Jmd0OzwvYT48L2xpPjwvdWw+Il0sWzBdLFtbMSwiMiIsM11dLG51bGxd"></nav>
   :extras_2_23: <nav id="test-nav-id" class="pagy-rjs pagy-bootstrap nav-js" aria-label="Pages"
     data-pagy="WyJuaiIsWyI8dWwgY2xhc3M9XCJwYWdpbmF0aW9uXCI+PGxpIGNsYXNzPVwicGFnZS1pdGVtIHByZXZcIj48YSBhbmNob3Jfc3RyaW5nIGhyZWY9XCIvZm9vP3BhZ2U9MVwiIGNsYXNzPVwicGFnZS1saW5rXCIgYXJpYS1sYWJlbD1cIlByZXZpb3VzXCI+Jmx0OzwvYT48L2xpPiIsIjxsaSBjbGFzcz1cInBhZ2UtaXRlbVwiPjxhIGFuY2hvcl9zdHJpbmcgaHJlZj1cIi9mb28/cGFnZT1QIFwiIGNsYXNzPVwicGFnZS1saW5rXCI+TDwvYT48L2xpPiIsIjxsaSBjbGFzcz1cInBhZ2UtaXRlbSBhY3RpdmVcIj48YSByb2xlPVwibGlua1wiIGNsYXNzPVwicGFnZS1saW5rXCIgYXJpYS1jdXJyZW50PVwicGFnZVwiIGFyaWEtZGlzYWJsZWQ9XCJ0cnVlXCI+TDwvYT48L2xpPiIsIjxsaSBjbGFzcz1cInBhZ2UtaXRlbSBnYXAgZGlzYWJsZWRcIj48YSByb2xlPVwibGlua1wiIGNsYXNzPVwicGFnZS1saW5rXCIgYXJpYS1kaXNhYmxlZD1cInRydWVcIj4maGVsbGlwOzwvYT48L2xpPiIsIjxsaSBjbGFzcz1cInBhZ2UtaXRlbSBuZXh0XCI+PGEgYW5jaG9yX3N0cmluZyBocmVmPVwiL2Zvbz9wYWdlPTNcIiBjbGFzcz1cInBhZ2UtbGlua1wiIGFyaWEtbGFiZWw9XCJOZXh0XCI+Jmd0OzwvYT48L2xpPjwvdWw+Il0sWzYwMCwwXSxbWzEsIjIiLDNdLFsxLCIyIiwzXV0sbnVsbF0="></nav>
+pagy/extras/bootstrap___pagy_bootstrap_nav_js_test_0001_renders_single_and_multiple_pages_when_used_with_Pagy__Offset__Countless:
+  :plain_1_0: <nav class="pagy-bootstrap nav-js" aria-label="Page" data-pagy="WyJuaiIsWyI8dWwgY2xhc3M9XCJwYWdpbmF0aW9uXCI+PGxpIGNsYXNzPVwicGFnZS1pdGVtIHByZXYgZGlzYWJsZWRcIj48YSByb2xlPVwibGlua1wiIGNsYXNzPVwicGFnZS1saW5rXCIgYXJpYS1kaXNhYmxlZD1cInRydWVcIiBhcmlhLWxhYmVsPVwiUHJldmlvdXNcIj4mbHQ7PC9hPjwvbGk+IiwiPGxpIGNsYXNzPVwicGFnZS1pdGVtXCI+PGEgaHJlZj1cIi9mb28/cGFnZT1QIFwiIGNsYXNzPVwicGFnZS1saW5rXCI+TDwvYT48L2xpPiIsIjxsaSBjbGFzcz1cInBhZ2UtaXRlbSBhY3RpdmVcIj48YSByb2xlPVwibGlua1wiIGNsYXNzPVwicGFnZS1saW5rXCIgYXJpYS1jdXJyZW50PVwicGFnZVwiIGFyaWEtZGlzYWJsZWQ9XCJ0cnVlXCI+TDwvYT48L2xpPiIsIjxsaSBjbGFzcz1cInBhZ2UtaXRlbSBnYXAgZGlzYWJsZWRcIj48YSByb2xlPVwibGlua1wiIGNsYXNzPVwicGFnZS1saW5rXCIgYXJpYS1kaXNhYmxlZD1cInRydWVcIj4maGVsbGlwOzwvYT48L2xpPiIsIjxsaSBjbGFzcz1cInBhZ2UtaXRlbSBuZXh0IGRpc2FibGVkXCI+PGEgcm9sZT1cImxpbmtcIiBjbGFzcz1cInBhZ2UtbGlua1wiIGFyaWEtZGlzYWJsZWQ9XCJ0cnVlXCIgYXJpYS1sYWJlbD1cIk5leHRcIj4mZ3Q7PC9hPjwvbGk+PC91bD4iXSxbMF0sW1siMSJdXSxudWxsXQ=="></nav>
+  :extras_1_0: <nav id="test-nav-id" class="pagy-rjs pagy-bootstrap nav-js" aria-label="Page"
+    data-pagy="WyJuaiIsWyI8dWwgY2xhc3M9XCJwYWdpbmF0aW9uXCI+PGxpIGNsYXNzPVwicGFnZS1pdGVtIHByZXYgZGlzYWJsZWRcIj48YSByb2xlPVwibGlua1wiIGNsYXNzPVwicGFnZS1saW5rXCIgYXJpYS1kaXNhYmxlZD1cInRydWVcIiBhcmlhLWxhYmVsPVwiUHJldmlvdXNcIj4mbHQ7PC9hPjwvbGk+IiwiPGxpIGNsYXNzPVwicGFnZS1pdGVtXCI+PGEgYW5jaG9yX3N0cmluZyBocmVmPVwiL2Zvbz9wYWdlPVAgXCIgY2xhc3M9XCJwYWdlLWxpbmtcIj5MPC9hPjwvbGk+IiwiPGxpIGNsYXNzPVwicGFnZS1pdGVtIGFjdGl2ZVwiPjxhIHJvbGU9XCJsaW5rXCIgY2xhc3M9XCJwYWdlLWxpbmtcIiBhcmlhLWN1cnJlbnQ9XCJwYWdlXCIgYXJpYS1kaXNhYmxlZD1cInRydWVcIj5MPC9hPjwvbGk+IiwiPGxpIGNsYXNzPVwicGFnZS1pdGVtIGdhcCBkaXNhYmxlZFwiPjxhIHJvbGU9XCJsaW5rXCIgY2xhc3M9XCJwYWdlLWxpbmtcIiBhcmlhLWRpc2FibGVkPVwidHJ1ZVwiPiZoZWxsaXA7PC9hPjwvbGk+IiwiPGxpIGNsYXNzPVwicGFnZS1pdGVtIG5leHQgZGlzYWJsZWRcIj48YSByb2xlPVwibGlua1wiIGNsYXNzPVwicGFnZS1saW5rXCIgYXJpYS1kaXNhYmxlZD1cInRydWVcIiBhcmlhLWxhYmVsPVwiTmV4dFwiPiZndDs8L2E+PC9saT48L3VsPiJdLFs2MDAsMF0sW1siMSJdLFsiMSJdXSxudWxsXQ=="></nav>
+  :plain_2_23: <nav class="pagy-bootstrap nav-js" aria-label="Pages" data-pagy="WyJuaiIsWyI8dWwgY2xhc3M9XCJwYWdpbmF0aW9uXCI+PGxpIGNsYXNzPVwicGFnZS1pdGVtIHByZXZcIj48YSBocmVmPVwiL2Zvbz9wYWdlPTFcIiBjbGFzcz1cInBhZ2UtbGlua1wiIGFyaWEtbGFiZWw9XCJQcmV2aW91c1wiPiZsdDs8L2E+PC9saT4iLCI8bGkgY2xhc3M9XCJwYWdlLWl0ZW1cIj48YSBocmVmPVwiL2Zvbz9wYWdlPVAgXCIgY2xhc3M9XCJwYWdlLWxpbmtcIj5MPC9hPjwvbGk+IiwiPGxpIGNsYXNzPVwicGFnZS1pdGVtIGFjdGl2ZVwiPjxhIHJvbGU9XCJsaW5rXCIgY2xhc3M9XCJwYWdlLWxpbmtcIiBhcmlhLWN1cnJlbnQ9XCJwYWdlXCIgYXJpYS1kaXNhYmxlZD1cInRydWVcIj5MPC9hPjwvbGk+IiwiPGxpIGNsYXNzPVwicGFnZS1pdGVtIGdhcCBkaXNhYmxlZFwiPjxhIHJvbGU9XCJsaW5rXCIgY2xhc3M9XCJwYWdlLWxpbmtcIiBhcmlhLWRpc2FibGVkPVwidHJ1ZVwiPiZoZWxsaXA7PC9hPjwvbGk+IiwiPGxpIGNsYXNzPVwicGFnZS1pdGVtIG5leHRcIj48YSBocmVmPVwiL2Zvbz9wYWdlPTNcIiBjbGFzcz1cInBhZ2UtbGlua1wiIGFyaWEtbGFiZWw9XCJOZXh0XCI+Jmd0OzwvYT48L2xpPjwvdWw+Il0sWzBdLFtbMSwiMiIsM11dLG51bGxd"></nav>
+  :extras_2_23: <nav id="test-nav-id" class="pagy-rjs pagy-bootstrap nav-js" aria-label="Pages"
+    data-pagy="WyJuaiIsWyI8dWwgY2xhc3M9XCJwYWdpbmF0aW9uXCI+PGxpIGNsYXNzPVwicGFnZS1pdGVtIHByZXZcIj48YSBhbmNob3Jfc3RyaW5nIGhyZWY9XCIvZm9vP3BhZ2U9MVwiIGNsYXNzPVwicGFnZS1saW5rXCIgYXJpYS1sYWJlbD1cIlByZXZpb3VzXCI+Jmx0OzwvYT48L2xpPiIsIjxsaSBjbGFzcz1cInBhZ2UtaXRlbVwiPjxhIGFuY2hvcl9zdHJpbmcgaHJlZj1cIi9mb28/cGFnZT1QIFwiIGNsYXNzPVwicGFnZS1saW5rXCI+TDwvYT48L2xpPiIsIjxsaSBjbGFzcz1cInBhZ2UtaXRlbSBhY3RpdmVcIj48YSByb2xlPVwibGlua1wiIGNsYXNzPVwicGFnZS1saW5rXCIgYXJpYS1jdXJyZW50PVwicGFnZVwiIGFyaWEtZGlzYWJsZWQ9XCJ0cnVlXCI+TDwvYT48L2xpPiIsIjxsaSBjbGFzcz1cInBhZ2UtaXRlbSBnYXAgZGlzYWJsZWRcIj48YSByb2xlPVwibGlua1wiIGNsYXNzPVwicGFnZS1saW5rXCIgYXJpYS1kaXNhYmxlZD1cInRydWVcIj4maGVsbGlwOzwvYT48L2xpPiIsIjxsaSBjbGFzcz1cInBhZ2UtaXRlbSBuZXh0XCI+PGEgYW5jaG9yX3N0cmluZyBocmVmPVwiL2Zvbz9wYWdlPTNcIiBjbGFzcz1cInBhZ2UtbGlua1wiIGFyaWEtbGFiZWw9XCJOZXh0XCI+Jmd0OzwvYT48L2xpPjwvdWw+Il0sWzYwMCwwXSxbWzEsIjIiLDNdLFsxLCIyIiwzXV0sbnVsbF0="></nav>
diff --git a/test/pagy/extras/bulma_test.rb b/test/pagy/extras/bulma_test.rb
index eba06fddf..256780868 100644
--- a/test/pagy/extras/bulma_test.rb
+++ b/test/pagy/extras/bulma_test.rb
@@ -17,7 +17,7 @@
   end
 
   describe "#pagy#{PREFIX}_nav_js" do
-    it 'renders single and multiple pages when used with Pagy::Countless' do
+    it 'renders single and multiple pages when used with Pagy::Offset::Countless' do
       nav_js_countless_tests(PREFIX)
     end
     it 'renders first, intermediate and last pages with required steps' do
diff --git a/test/pagy/extras/bulma_test.rb.yaml b/test/pagy/extras/bulma_test.rb.yaml
index 63d506746..79906586b 100644
--- a/test/pagy/extras/bulma_test.rb.yaml
+++ b/test/pagy/extras/bulma_test.rb.yaml
@@ -136,3 +136,12 @@ pagy/extras/bulma___pagy_bulma_nav_test_0001_renders_first,_intermediate_and_las
     href="/foo?page=1" class="pagination-link">1</a></li><li><a role="link" class="pagination-link
     is-current" aria-current="page" aria-disabled="true">2</a></li><li><a href="/foo?page=3"
     class="pagination-link">3</a></li></ul></nav>
+pagy/extras/bulma___pagy_bulma_nav_js_test_0001_renders_single_and_multiple_pages_when_used_with_Pagy__Offset__Countless:
+  :plain_1_0: <nav class="pagy-bulma nav-js pagination is-centered" aria-label="Page"
+    data-pagy="WyJuaiIsWyI8YSByb2xlPVwibGlua1wiIGNsYXNzPVwicGFnaW5hdGlvbi1wcmV2aW91c1wiIGRpc2FibGVkIGFyaWEtZGlzYWJsZWQ9XCJ0cnVlXCIgYXJpYS1sYWJlbD1cIlByZXZpb3VzXCI+Jmx0OzwvYT48YSByb2xlPVwibGlua1wiIGNsYXNzPVwicGFnaW5hdGlvbi1uZXh0XCIgZGlzYWJsZWQgYXJpYS1kaXNhYmxlZD1cInRydWVcIiBhcmlhLWxhYmVsPVwiTmV4dFwiPiZndDs8L2E+PHVsIGNsYXNzPVwicGFnaW5hdGlvbi1saXN0XCI+IiwiPGxpPjxhIGhyZWY9XCIvZm9vP3BhZ2U9UCBcIiBjbGFzcz1cInBhZ2luYXRpb24tbGlua1wiPkw8L2E+PC9saT4iLCI8bGk+PGEgcm9sZT1cImxpbmtcIiBjbGFzcz1cInBhZ2luYXRpb24tbGluayBpcy1jdXJyZW50XCIgYXJpYS1jdXJyZW50PVwicGFnZVwiIGFyaWEtZGlzYWJsZWQ9XCJ0cnVlXCI+TDwvYT48L2xpPiIsIjxsaT48c3BhbiBjbGFzcz1cInBhZ2luYXRpb24tZWxsaXBzaXNcIj4maGVsbGlwOzwvc3Bhbj48L2xpPiIsIjwvdWw+Il0sWzBdLFtbIjEiXV0sbnVsbF0="></nav>
+  :extras_1_0: <nav id="test-nav-id" class="pagy-rjs pagy-bulma nav-js pagination
+    is-centered" aria-label="Page" data-pagy="WyJuaiIsWyI8YSByb2xlPVwibGlua1wiIGNsYXNzPVwicGFnaW5hdGlvbi1wcmV2aW91c1wiIGRpc2FibGVkIGFyaWEtZGlzYWJsZWQ9XCJ0cnVlXCIgYXJpYS1sYWJlbD1cIlByZXZpb3VzXCI+Jmx0OzwvYT48YSByb2xlPVwibGlua1wiIGNsYXNzPVwicGFnaW5hdGlvbi1uZXh0XCIgZGlzYWJsZWQgYXJpYS1kaXNhYmxlZD1cInRydWVcIiBhcmlhLWxhYmVsPVwiTmV4dFwiPiZndDs8L2E+PHVsIGNsYXNzPVwicGFnaW5hdGlvbi1saXN0XCI+IiwiPGxpPjxhIGFuY2hvcl9zdHJpbmcgaHJlZj1cIi9mb28/cGFnZT1QIFwiIGNsYXNzPVwicGFnaW5hdGlvbi1saW5rXCI+TDwvYT48L2xpPiIsIjxsaT48YSByb2xlPVwibGlua1wiIGNsYXNzPVwicGFnaW5hdGlvbi1saW5rIGlzLWN1cnJlbnRcIiBhcmlhLWN1cnJlbnQ9XCJwYWdlXCIgYXJpYS1kaXNhYmxlZD1cInRydWVcIj5MPC9hPjwvbGk+IiwiPGxpPjxzcGFuIGNsYXNzPVwicGFnaW5hdGlvbi1lbGxpcHNpc1wiPiZoZWxsaXA7PC9zcGFuPjwvbGk+IiwiPC91bD4iXSxbNjAwLDBdLFtbIjEiXSxbIjEiXV0sbnVsbF0="></nav>
+  :plain_2_23: <nav class="pagy-bulma nav-js pagination is-centered" aria-label="Pages"
+    data-pagy="WyJuaiIsWyI8YSBocmVmPVwiL2Zvbz9wYWdlPTFcIiBjbGFzcz1cInBhZ2luYXRpb24tcHJldmlvdXNcIiBhcmlhLWxhYmVsPVwiUHJldmlvdXNcIj4mbHQ7PC9hPjxhIGhyZWY9XCIvZm9vP3BhZ2U9M1wiIGNsYXNzPVwicGFnaW5hdGlvbi1uZXh0XCIgYXJpYS1sYWJlbD1cIk5leHRcIj4mZ3Q7PC9hPjx1bCBjbGFzcz1cInBhZ2luYXRpb24tbGlzdFwiPiIsIjxsaT48YSBocmVmPVwiL2Zvbz9wYWdlPVAgXCIgY2xhc3M9XCJwYWdpbmF0aW9uLWxpbmtcIj5MPC9hPjwvbGk+IiwiPGxpPjxhIHJvbGU9XCJsaW5rXCIgY2xhc3M9XCJwYWdpbmF0aW9uLWxpbmsgaXMtY3VycmVudFwiIGFyaWEtY3VycmVudD1cInBhZ2VcIiBhcmlhLWRpc2FibGVkPVwidHJ1ZVwiPkw8L2E+PC9saT4iLCI8bGk+PHNwYW4gY2xhc3M9XCJwYWdpbmF0aW9uLWVsbGlwc2lzXCI+JmhlbGxpcDs8L3NwYW4+PC9saT4iLCI8L3VsPiJdLFswXSxbWzEsIjIiLDNdXSxudWxsXQ=="></nav>
+  :extras_2_23: <nav id="test-nav-id" class="pagy-rjs pagy-bulma nav-js pagination
+    is-centered" aria-label="Pages" data-pagy="WyJuaiIsWyI8YSBhbmNob3Jfc3RyaW5nIGhyZWY9XCIvZm9vP3BhZ2U9MVwiIGNsYXNzPVwicGFnaW5hdGlvbi1wcmV2aW91c1wiIGFyaWEtbGFiZWw9XCJQcmV2aW91c1wiPiZsdDs8L2E+PGEgYW5jaG9yX3N0cmluZyBocmVmPVwiL2Zvbz9wYWdlPTNcIiBjbGFzcz1cInBhZ2luYXRpb24tbmV4dFwiIGFyaWEtbGFiZWw9XCJOZXh0XCI+Jmd0OzwvYT48dWwgY2xhc3M9XCJwYWdpbmF0aW9uLWxpc3RcIj4iLCI8bGk+PGEgYW5jaG9yX3N0cmluZyBocmVmPVwiL2Zvbz9wYWdlPVAgXCIgY2xhc3M9XCJwYWdpbmF0aW9uLWxpbmtcIj5MPC9hPjwvbGk+IiwiPGxpPjxhIHJvbGU9XCJsaW5rXCIgY2xhc3M9XCJwYWdpbmF0aW9uLWxpbmsgaXMtY3VycmVudFwiIGFyaWEtY3VycmVudD1cInBhZ2VcIiBhcmlhLWRpc2FibGVkPVwidHJ1ZVwiPkw8L2E+PC9saT4iLCI8bGk+PHNwYW4gY2xhc3M9XCJwYWdpbmF0aW9uLWVsbGlwc2lzXCI+JmhlbGxpcDs8L3NwYW4+PC9saT4iLCI8L3VsPiJdLFs2MDAsMF0sW1sxLCIyIiwzXSxbMSwiMiIsM11dLG51bGxd"></nav>
diff --git a/test/pagy/extras/calendar_extra_test.rb b/test/pagy/extras/calendar_extra_test.rb
index 6cc5f6b69..d82a655d4 100644
--- a/test/pagy/extras/calendar_extra_test.rb
+++ b/test/pagy/extras/calendar_extra_test.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative '../../test_helper'
-require 'pagy/extras/calendar'
 
 require_relative '../../files/models'
 require_relative '../../mock_helpers/app'
@@ -15,13 +14,13 @@ def app(**)
 
 describe 'pagy/extras/calendar' do
   describe 'instance methods' do
-    it 'returns a Pagy::Calendar::Month instance' do
+    it 'returns a Pagy::Offset::Calendar::Month instance' do
       calendar, pagy, _records = app(params: { page: 1 }).send(:pagy_calendar,
                                                                Event.all,
                                                                month: { period: [Time.now, Time.now + 5000] },
                                                                pagy: {})
-      _(calendar[:month]).must_be_instance_of Pagy::Calendar::Month
-      _(pagy).must_be_instance_of Pagy
+      _(calendar[:month]).must_be_instance_of Pagy::Offset::Calendar::Month
+      _(pagy).must_be_instance_of Pagy::Offset
     end
     it 'skips the calendar' do
       calendar, pagy, records = app(params: { page: 1 }).send(:pagy_calendar,
@@ -31,7 +30,7 @@ def app(**)
                                                               active: false)
       _(calendar).must_be_nil
       _(records.size).must_equal 20
-      _(pagy).must_be_instance_of Pagy
+      _(pagy).must_be_instance_of Pagy::Offset
       _(pagy.count).must_equal 505
       _(pagy.pages).must_equal 26
     end
@@ -261,10 +260,10 @@ def app(**)
         .must_equal "/foo?page=1&year_page=1&month_page=1"
 
       _ { app.send(:pagy_calendar_url_at, calendar, Time.zone.local(2100)) }
-        .must_raise Pagy::Calendar::OutOfRangeError
+        .must_raise Pagy::Offset::Calendar::OutOfRangeError
 
       _ { app.send(:pagy_calendar_url_at, calendar, Time.zone.local(2000)) }
-        .must_raise Pagy::Calendar::OutOfRangeError
+        .must_raise Pagy::Offset::Calendar::OutOfRangeError
     end
   end
   describe "#showtime" do
diff --git a/test/pagy/extras/countless_extra_test.rb b/test/pagy/extras/countless_extra_test.rb
index ea8f2ed07..ce26a2695 100644
--- a/test/pagy/extras/countless_extra_test.rb
+++ b/test/pagy/extras/countless_extra_test.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative '../../test_helper'
-require 'pagy/extras/countless'
 
 require_relative '../../mock_helpers/collection'
 require_relative '../../mock_helpers/app'
diff --git a/test/pagy/extras/elasticsearch_rails_test.rb b/test/pagy/extras/elasticsearch_rails_test.rb
index 8ff624792..b00824569 100644
--- a/test/pagy/extras/elasticsearch_rails_test.rb
+++ b/test/pagy/extras/elasticsearch_rails_test.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative '../../test_helper'
-require 'pagy/extras/overflow'
 
 require_relative '../../mock_helpers/elasticsearch_rails'
 require_relative '../../mock_helpers/collection'
@@ -33,7 +32,7 @@
       it 'paginates response with defaults' do
         pagy, response = app.send(:pagy_elasticsearch_rails, MockElasticsearchRails::Model.pagy_search('a'))
         records = response.records
-        _(pagy).must_be_instance_of Pagy
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal Pagy::DEFAULT[:limit]
         _(pagy.page).must_equal app.params[:page].to_i
@@ -43,7 +42,7 @@
       it 'paginates records with defaults' do
         pagy, records = app.send(:pagy_elasticsearch_rails,
                                  MockElasticsearchRails::Model.pagy_search('a').records)
-        _(pagy).must_be_instance_of Pagy
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal Pagy::DEFAULT[:limit]
         _(pagy.page).must_equal app.params[:page].to_i
@@ -54,7 +53,7 @@
         pagy, records = app.send(:pagy_elasticsearch_rails,
                                  MockElasticsearchRails::Model.pagy_search('b').records,
                                  page: 2, limit: 10, anchor_string: 'X')
-        _(pagy).must_be_instance_of Pagy
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal 10
         _(pagy.page).must_equal 2
@@ -66,7 +65,7 @@
         pagy, records = app.send(:pagy_elasticsearch_rails,
                                  MockElasticsearchRails::Model.pagy_search('b').records,
                                  page: 200, limit: 10, anchor_string: 'X', overflow: :last_page)
-        _(pagy).must_be_instance_of Pagy
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal 10
         _(pagy.page).must_equal 100
@@ -83,7 +82,7 @@
       it 'paginates response with defaults' do
         pagy, response = app.send(:pagy_elasticsearch_rails, MockElasticsearchRails::ModelES7.pagy_search('a'))
         records = response.records
-        _(pagy).must_be_instance_of Pagy
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal Pagy::DEFAULT[:limit]
         _(pagy.page).must_equal app.params[:page].to_i
@@ -93,7 +92,7 @@
       it 'paginates records with defaults' do
         pagy, records = app.send(:pagy_elasticsearch_rails,
                                  MockElasticsearchRails::ModelES7.pagy_search('a').records)
-        _(pagy).must_be_instance_of Pagy
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal Pagy::DEFAULT[:limit]
         _(pagy.page).must_equal app.params[:page].to_i
@@ -104,7 +103,7 @@
         pagy, records = app.send(:pagy_elasticsearch_rails,
                                  MockElasticsearchRails::ModelES7.pagy_search('b').records,
                                  page: 2, limit: 10, anchor_string: 'X')
-        _(pagy).must_be_instance_of Pagy
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal 10
         _(pagy.page).must_equal 2
@@ -116,7 +115,7 @@
         pagy, records = app.send(:pagy_elasticsearch_rails,
                                  MockElasticsearchRails::Model.pagy_search('b').records,
                                  page: 200, limit: 10, anchor_string: 'X', overflow: :last_page)
-        _(pagy).must_be_instance_of Pagy
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal 10
         _(pagy.page).must_equal 100
@@ -128,16 +127,16 @@
     describe 'new_from_elasticsearch_rails' do
       it 'paginates response with defaults' do
         response = MockElasticsearchRails::Model.search('a')
-        pagy     = Pagy.new_from_elasticsearch_rails(response)
-        _(pagy).must_be_instance_of Pagy
+        pagy     = Pagy::Offset.new_from_elasticsearch_rails(response)
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal 10
         _(pagy.page).must_equal 1
       end
       it 'paginates response with vars' do
         response = MockElasticsearchRails::Model.search('b', from: 15, size: 15)
-        pagy     = Pagy.new_from_elasticsearch_rails(response, anchor_string: 'X')
-        _(pagy).must_be_instance_of Pagy
+        pagy     = Pagy::Offset.new_from_elasticsearch_rails(response, anchor_string: 'X')
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal 15
         _(pagy.page).must_equal 2
@@ -145,16 +144,16 @@
       end
       it 'paginates response with defaults on Elasticsearch 5' do
         response = MockElasticsearchRails::ModelES5.search('a')
-        pagy     = Pagy.new_from_elasticsearch_rails(response)
-        _(pagy).must_be_instance_of Pagy
+        pagy     = Pagy::Offset.new_from_elasticsearch_rails(response)
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal 10
         _(pagy.page).must_equal 1
       end
       it 'paginates response with vars on Elasticsearch 5' do
         response = MockElasticsearchRails::ModelES5.search('b', from: 15, size: 15)
-        pagy     = Pagy.new_from_elasticsearch_rails(response, anchor_string: 'X')
-        _(pagy).must_be_instance_of Pagy
+        pagy     = Pagy::Offset.new_from_elasticsearch_rails(response, anchor_string: 'X')
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal 15
         _(pagy.page).must_equal 2
diff --git a/test/pagy/extras/gearbox_test.rb b/test/pagy/extras/gearbox_test.rb
index cde3089d9..d2ce0b5cf 100644
--- a/test/pagy/extras/gearbox_test.rb
+++ b/test/pagy/extras/gearbox_test.rb
@@ -1,99 +1,100 @@
 # frozen_string_literal: true
 
 require_relative '../../test_helper'
-require 'pagy/extras/countless'
 require 'pagy/extras/gearbox'
 require 'pagy/extras/limit'
+require 'pagy/offset/countless'
+
 Pagy::DEFAULT[:limit_extra] = false
 
 describe 'pagy/extras/gearbox' do
   describe '#assign_limit' do
     it 'raises VariableErrors for wrong limit types' do
-      _ { Pagy.new(count: 3, page: 1,  gearbox_limit: [-1, 10]) }.must_raise Pagy::VariableError
-      _ { Pagy.new(count: 3, page: 1,  gearbox_limit: [0, 10]) }.must_raise Pagy::VariableError
-      _ { Pagy.new(count: 3, page: 1,  gearbox_limit: [5, "10"]) }.must_raise Pagy::VariableError
+      _ { Pagy::Offset.new(count: 3, page: 1,  gearbox_limit: [-1, 10]) }.must_raise Pagy::VariableError
+      _ { Pagy::Offset.new(count: 3, page: 1,  gearbox_limit: [0, 10]) }.must_raise Pagy::VariableError
+      _ { Pagy::Offset.new(count: 3, page: 1,  gearbox_limit: [5, "10"]) }.must_raise Pagy::VariableError
     end
     it 'can skips gearbox in Pagy' do
-      _(Pagy.new(count: 0, page: 1, limit_extra: true).limit).must_equal 20
-      _(Pagy.new(count: 0, page: 1, gearbox_extra: false).limit).must_equal 20
+      _(Pagy::Offset.new(count: 0, page: 1, limit_extra: true).limit).must_equal 20
+      _(Pagy::Offset.new(count: 0, page: 1, gearbox_extra: false).limit).must_equal 20
     end
     it 'sets the limit in Pagy' do
-      _(Pagy.new(count: 0,    page: 1).limit).must_equal 15
-      _(Pagy.new(count: 15,   page: 1).limit).must_equal 15
-      _(Pagy.new(count: 45,   page: 2).limit).must_equal 30
-      _(Pagy.new(count: 1000, page: 3).limit).must_equal 60
-      _(Pagy.new(count: 1000, page: 4).limit).must_equal 100
-      _(Pagy.new(count: 0,   page: 1,  gearbox_limit: [3, 10]).limit).must_equal 3
-      _(Pagy.new(count: 3,   page: 1,  gearbox_limit: [3, 10]).limit).must_equal 3
-      _(Pagy.new(count: 13,  page: 2,  gearbox_limit: [3, 10]).limit).must_equal 10
-      _(Pagy.new(count: 103, page: 1,  gearbox_limit: [3, 10]).limit).must_equal 3
-      _(Pagy.new(count: 103, page: 2,  gearbox_limit: [3, 10]).limit).must_equal 10
-      _(Pagy.new(count: 103, page: 3,  gearbox_limit: [3, 10]).limit).must_equal 10
-      _(Pagy.new(count: 103, page: 11, gearbox_limit: [3, 10]).limit).must_equal 10
+      _(Pagy::Offset.new(count: 0,    page: 1).limit).must_equal 15
+      _(Pagy::Offset.new(count: 15,   page: 1).limit).must_equal 15
+      _(Pagy::Offset.new(count: 45,   page: 2).limit).must_equal 30
+      _(Pagy::Offset.new(count: 1000, page: 3).limit).must_equal 60
+      _(Pagy::Offset.new(count: 1000, page: 4).limit).must_equal 100
+      _(Pagy::Offset.new(count: 0,   page: 1,  gearbox_limit: [3, 10]).limit).must_equal 3
+      _(Pagy::Offset.new(count: 3,   page: 1,  gearbox_limit: [3, 10]).limit).must_equal 3
+      _(Pagy::Offset.new(count: 13,  page: 2,  gearbox_limit: [3, 10]).limit).must_equal 10
+      _(Pagy::Offset.new(count: 103, page: 1,  gearbox_limit: [3, 10]).limit).must_equal 3
+      _(Pagy::Offset.new(count: 103, page: 2,  gearbox_limit: [3, 10]).limit).must_equal 10
+      _(Pagy::Offset.new(count: 103, page: 3,  gearbox_limit: [3, 10]).limit).must_equal 10
+      _(Pagy::Offset.new(count: 103, page: 11, gearbox_limit: [3, 10]).limit).must_equal 10
     end
-    it 'can skips gearbox in Pagy::Countless' do
-      _(Pagy::Countless.new(page: 1, limit_extra: true).limit).must_equal 20
-      _(Pagy::Countless.new(page: 1, gearbox_extra: false).limit).must_equal 20
+    it 'can skips gearbox in Pagy::Offset::Countless' do
+      _(Pagy::Offset::Countless.new(page: 1, limit_extra: true).limit).must_equal 20
+      _(Pagy::Offset::Countless.new(page: 1, gearbox_extra: false).limit).must_equal 20
     end
-    it 'sets the limit in Pagy::Countless' do
-      _(Pagy::Countless.new(page: 1).limit).must_equal 15
-      _(Pagy::Countless.new(page: 1).limit).must_equal 15
-      _(Pagy::Countless.new(page: 2).limit).must_equal 30
-      _(Pagy::Countless.new(page: 3).limit).must_equal 60
-      _(Pagy::Countless.new(page: 4).limit).must_equal 100
-      _(Pagy::Countless.new(page: 1, gearbox_limit: [3, 10]).limit).must_equal 3
-      _(Pagy::Countless.new(page: 1, gearbox_limit: [3, 10]).limit).must_equal 3
-      _(Pagy::Countless.new(page: 2, gearbox_limit: [3, 10]).limit).must_equal 10
-      _(Pagy::Countless.new(page: 1, gearbox_limit: [3, 10]).limit).must_equal 3
-      _(Pagy::Countless.new(page: 2, gearbox_limit: [3, 10]).limit).must_equal 10
-      _(Pagy::Countless.new(page: 3, gearbox_limit: [3, 10]).limit).must_equal 10
-      _(Pagy::Countless.new(page: 11, gearbox_limit: [3, 10]).limit).must_equal 10
+    it 'sets the limit in Pagy::Offset::Countless' do
+      _(Pagy::Offset::Countless.new(page: 1).limit).must_equal 15
+      _(Pagy::Offset::Countless.new(page: 1).limit).must_equal 15
+      _(Pagy::Offset::Countless.new(page: 2).limit).must_equal 30
+      _(Pagy::Offset::Countless.new(page: 3).limit).must_equal 60
+      _(Pagy::Offset::Countless.new(page: 4).limit).must_equal 100
+      _(Pagy::Offset::Countless.new(page: 1, gearbox_limit: [3, 10]).limit).must_equal 3
+      _(Pagy::Offset::Countless.new(page: 1, gearbox_limit: [3, 10]).limit).must_equal 3
+      _(Pagy::Offset::Countless.new(page: 2, gearbox_limit: [3, 10]).limit).must_equal 10
+      _(Pagy::Offset::Countless.new(page: 1, gearbox_limit: [3, 10]).limit).must_equal 3
+      _(Pagy::Offset::Countless.new(page: 2, gearbox_limit: [3, 10]).limit).must_equal 10
+      _(Pagy::Offset::Countless.new(page: 3, gearbox_limit: [3, 10]).limit).must_equal 10
+      _(Pagy::Offset::Countless.new(page: 11, gearbox_limit: [3, 10]).limit).must_equal 10
     end
   end
 
   describe '#assign_last' do
     it 'can skip gearbox for last' do
-      _(Pagy.new(count: 90, page: 1, limit_extra: true).last).must_equal 5
-      _(Pagy.new(count: 103, page: 1, gearbox_extra: false).last).must_equal 6
+      _(Pagy::Offset.new(count: 90, page: 1, limit_extra: true).last).must_equal 5
+      _(Pagy::Offset.new(count: 103, page: 1, gearbox_extra: false).last).must_equal 6
     end
     it 'sets the last' do
-      _(Pagy.new(count: 0,   page: 1,  gearbox_limit: [3, 10]).last).must_equal 1
-      _(Pagy.new(count: 3,   page: 1,  gearbox_limit: [3, 10]).last).must_equal 1
-      _(Pagy.new(count: 13,  page: 2,  gearbox_limit: [3, 10]).last).must_equal 2
-      _(Pagy.new(count: 103, page: 1,  gearbox_limit: [3, 10]).last).must_equal 11
-      _(Pagy.new(count: 103, page: 2,  gearbox_limit: [3, 10]).last).must_equal 11
-      _(Pagy.new(count: 103, page: 3,  gearbox_limit: [3, 10]).last).must_equal 11
-      _(Pagy.new(count: 103, page: 11, gearbox_limit: [3, 10]).last).must_equal 11
+      _(Pagy::Offset.new(count: 0,   page: 1,  gearbox_limit: [3, 10]).last).must_equal 1
+      _(Pagy::Offset.new(count: 3,   page: 1,  gearbox_limit: [3, 10]).last).must_equal 1
+      _(Pagy::Offset.new(count: 13,  page: 2,  gearbox_limit: [3, 10]).last).must_equal 2
+      _(Pagy::Offset.new(count: 103, page: 1,  gearbox_limit: [3, 10]).last).must_equal 11
+      _(Pagy::Offset.new(count: 103, page: 2,  gearbox_limit: [3, 10]).last).must_equal 11
+      _(Pagy::Offset.new(count: 103, page: 3,  gearbox_limit: [3, 10]).last).must_equal 11
+      _(Pagy::Offset.new(count: 103, page: 11, gearbox_limit: [3, 10]).last).must_equal 11
       # max_pages
-      _(Pagy.new(count: 24, page: 2, gearbox_limit: [3, 10], max_pages: 2).last).must_equal 2
-      _ { Pagy.new(count: 24, page: 3, gearbox_limit: [3, 10], max_pages: 2) }.must_raise Pagy::OverflowError
+      _(Pagy::Offset.new(count: 24, page: 2, gearbox_limit: [3, 10], max_pages: 2).last).must_equal 2
+      _ { Pagy::Offset.new(count: 24, page: 3, gearbox_limit: [3, 10], max_pages: 2) }.must_raise Pagy::OverflowError
     end
-    it "checks the last in Pagy::Countless" do
-      _(Pagy::Countless.new(page: 1, gearbox_limit: [3, 10]).finalize(2).last).must_equal 1
-      _(Pagy::Countless.new(page: 1, gearbox_limit: [3, 10]).finalize(4).last).must_equal 2
-      _(Pagy::Countless.new(page: 3, gearbox_limit: [3, 10]).finalize(7).last).must_equal 3
-      _(Pagy::Countless.new(page: 3, gearbox_limit: [3, 10]).finalize(11).last).must_equal 4
+    it "checks the last in Pagy::Offset::Countless" do
+      _(Pagy::Offset::Countless.new(page: 1, gearbox_limit: [3, 10]).finalize(2).last).must_equal 1
+      _(Pagy::Offset::Countless.new(page: 1, gearbox_limit: [3, 10]).finalize(4).last).must_equal 2
+      _(Pagy::Offset::Countless.new(page: 3, gearbox_limit: [3, 10]).finalize(7).last).must_equal 3
+      _(Pagy::Offset::Countless.new(page: 3, gearbox_limit: [3, 10]).finalize(11).last).must_equal 4
       # max_pages
-      _(Pagy::Countless.new(page: 2, gearbox_limit: [3, 10], max_pages: 2).finalize(11).last).must_equal 2
-      _ { Pagy::Countless.new(page: 3, gearbox_limit: [3, 10], max_pages: 2).finalize(11) }.must_raise Pagy::OverflowError
+      _(Pagy::Offset::Countless.new(page: 2, gearbox_limit: [3, 10], max_pages: 2).finalize(11).last).must_equal 2
+      _ { Pagy::Offset::Countless.new(page: 3, gearbox_limit: [3, 10], max_pages: 2).finalize(11) }.must_raise Pagy::OverflowError
     end
   end
 
   describe '#assign_offset' do
     it "checks the offset in Pagy" do
-      _(Pagy.new(count: 2, page: 1,  gearbox_limit: [3, 10]).offset).must_equal 0
-      _(Pagy.new(count: 3, page: 1,  gearbox_limit: [3, 10]).offset).must_equal 0
-      _(Pagy.new(count: 4, page: 1,  gearbox_limit: [3, 10]).offset).must_equal 0
-      _(Pagy.new(count: 10, page: 2,  gearbox_limit: [3, 10]).offset).must_equal 3
-      _(Pagy.new(count: 13, page: 2,  gearbox_limit: [3, 10]).offset).must_equal 3
-      _(Pagy.new(count: 60, page: 3,  gearbox_limit: [3, 10]).offset).must_equal 13
-      _(Pagy.new(count: 80, page: 4,  gearbox_limit: [3, 10]).offset).must_equal 23
+      _(Pagy::Offset.new(count: 2, page: 1,  gearbox_limit: [3, 10]).offset).must_equal 0
+      _(Pagy::Offset.new(count: 3, page: 1,  gearbox_limit: [3, 10]).offset).must_equal 0
+      _(Pagy::Offset.new(count: 4, page: 1,  gearbox_limit: [3, 10]).offset).must_equal 0
+      _(Pagy::Offset.new(count: 10, page: 2,  gearbox_limit: [3, 10]).offset).must_equal 3
+      _(Pagy::Offset.new(count: 13, page: 2,  gearbox_limit: [3, 10]).offset).must_equal 3
+      _(Pagy::Offset.new(count: 60, page: 3,  gearbox_limit: [3, 10]).offset).must_equal 13
+      _(Pagy::Offset.new(count: 80, page: 4,  gearbox_limit: [3, 10]).offset).must_equal 23
     end
-    it "checks the offset in Pagy::Countless" do
-      _(Pagy::Countless.new(page: 1, gearbox_limit: [3, 10]).offset).must_equal 0
-      _(Pagy::Countless.new(page: 2, gearbox_limit: [3, 10]).offset).must_equal 3
-      _(Pagy::Countless.new(page: 3, gearbox_limit: [3, 10]).offset).must_equal 13
-      _(Pagy::Countless.new(page: 4, gearbox_limit: [3, 10]).offset).must_equal 23
+    it "checks the offset in Pagy::Offset::Countless" do
+      _(Pagy::Offset::Countless.new(page: 1, gearbox_limit: [3, 10]).offset).must_equal 0
+      _(Pagy::Offset::Countless.new(page: 2, gearbox_limit: [3, 10]).offset).must_equal 3
+      _(Pagy::Offset::Countless.new(page: 3, gearbox_limit: [3, 10]).offset).must_equal 13
+      _(Pagy::Offset::Countless.new(page: 4, gearbox_limit: [3, 10]).offset).must_equal 23
     end
   end
 end
diff --git a/test/pagy/extras/headers_test.rb b/test/pagy/extras/headers_test.rb
index 0c0f11a9b..a296e11e5 100644
--- a/test/pagy/extras/headers_test.rb
+++ b/test/pagy/extras/headers_test.rb
@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
 require_relative '../../test_helper'
-require 'pagy/extras/headers'
-require 'pagy/extras/calendar'
-require 'pagy/extras/countless'
-require 'pagy/extras/keyset'
 
 require_relative '../../mock_helpers/collection'
 require_relative '../../mock_helpers/app'
@@ -17,15 +13,15 @@
       @collection = MockCollection.new
     end
     it 'returns the full headers hash' do
-      pagy, _records = app.send(:pagy, @collection)
+      pagy, _records = app.send(:pagy_offset, @collection)
       _(app.send(:pagy_headers, pagy)).must_rematch :headers
     end
     it 'returns custom headers hash' do
-      pagy, _records = app.send(:pagy, @collection, headers: { limit: 'Per-Page', count: 'Total', pages: false })
+      pagy, _records = app.send(:pagy_offset, @collection, headers: { limit: 'Per-Page', count: 'Total', pages: false })
       _(app.send(:pagy_headers, pagy)).must_rematch :headers
     end
     it 'returns custom headers hash' do
-      pagy, _records = app.send(:pagy, @collection, headers: { limit: false, count: false })
+      pagy, _records = app.send(:pagy_offset, @collection, headers: { limit: false, count: false })
       _(app.send(:pagy_headers, pagy)).must_rematch :headers
     end
     it 'returns the countless headers hash' do
@@ -33,11 +29,11 @@
       _(app.send(:pagy_headers, pagy)).must_rematch :headers
     end
     it 'omit prev on first page' do
-      pagy, _records = app.send(:pagy, @collection, page: 1)
+      pagy, _records = app.send(:pagy_offset, @collection, page: 1)
       _(app.send(:pagy_headers, pagy)).must_rematch :headers
     end
     it 'omit next on last page' do
-      pagy, _records = app.send(:pagy, @collection, page: 50)
+      pagy, _records = app.send(:pagy_offset, @collection, page: 50)
       _(app.send(:pagy_headers, pagy)).must_rematch :headers
     end
   end
@@ -45,15 +41,15 @@
   describe '#pagy_headers with Calendar' do
     let(:app) { MockApp::Calendar.new(params: { a: 'one', b: 'two' }) }
     it 'returns the full headers hash' do
-      pagy, _records = app.send(:pagy, Event.all)
+      pagy, _records = app.send(:pagy_offset, Event.all)
       _(app.send(:pagy_headers, pagy)).must_rematch :headers
     end
     it 'returns custom headers hash' do
-      pagy, _records = app.send(:pagy, Event.all, headers: { limit: 'Per-Page', count: 'Total', pages: false })
+      pagy, _records = app.send(:pagy_offset, Event.all, headers: { limit: 'Per-Page', count: 'Total', pages: false })
       _(app.send(:pagy_headers, pagy)).must_rematch :headers
     end
     it 'returns custom headers hash' do
-      pagy, _records = app.send(:pagy, Event.all, headers: { limit: false, count: false })
+      pagy, _records = app.send(:pagy_offset, Event.all, headers: { limit: false, count: false })
       _(app.send(:pagy_headers, pagy)).must_rematch :headers
     end
     it 'returns the countless headers hash' do
@@ -61,11 +57,11 @@
       _(app.send(:pagy_headers, pagy)).must_rematch :headers
     end
     it 'omit prev on first page' do
-      pagy, _records = app.send(:pagy, Event.all, page: 1)
+      pagy, _records = app.send(:pagy_offset, Event.all, page: 1)
       _(app.send(:pagy_headers, pagy)).must_rematch :headers
     end
     it 'omit next on last page' do
-      pagy, _records = app.send(:pagy, Event.all, page: 26)
+      pagy, _records = app.send(:pagy_offset, Event.all, page: 26)
       _(app.send(:pagy_headers, pagy)).must_rematch :headers
     end
   end
@@ -95,7 +91,7 @@
       @collection = MockCollection.new
     end
     it 'returns the full headers hash' do
-      pagy, _records = app.send(:pagy, @collection)
+      pagy, _records = app.send(:pagy_offset, @collection)
       app.send(:pagy_headers_merge, pagy)
       _(app.send(:response).headers).must_rematch :response
     end
@@ -103,7 +99,7 @@
   describe '#pagy_headers_merge with Calendar' do
     let(:app) { MockApp::Calendar.new }
     it 'returns the full headers hash' do
-      pagy, _records = app.send(:pagy, Event.all)
+      pagy, _records = app.send(:pagy_offset, Event.all)
       app.send(:pagy_headers_merge, pagy)
       _(app.send(:response).headers.to_hash).must_rematch :response
     end
diff --git a/test/pagy/extras/i18n_calendar_extra_test.rb b/test/pagy/extras/i18n_calendar_extra_test.rb
index 19c84e89b..86ffefa0b 100644
--- a/test/pagy/extras/i18n_calendar_extra_test.rb
+++ b/test/pagy/extras/i18n_calendar_extra_test.rb
@@ -30,20 +30,20 @@
 
   describe '#pagy_info with I18n' do
     it 'renders info' do
-      _(app.pagy_info(Pagy.new(count: 0))).must_rematch :info_0
-      _(app.pagy_info(Pagy.new(count: 1))).must_rematch :info_1
-      _(app.pagy_info(Pagy.new(count: 13))).must_rematch :info_13
-      _(app.pagy_info(Pagy.new(count: 100, page: 3))).must_rematch :info_100
+      _(app.pagy_info(Pagy::Offset.new(count: 0))).must_rematch :info_0
+      _(app.pagy_info(Pagy::Offset.new(count: 1))).must_rematch :info_1
+      _(app.pagy_info(Pagy::Offset.new(count: 13))).must_rematch :info_13
+      _(app.pagy_info(Pagy::Offset.new(count: 100, page: 3))).must_rematch :info_100
     end
   end
 
   describe 'Calendar with I18n.l' do
     I18n.load_path += Dir[Pagy.root.join('..', 'test', 'files', 'locales', '*.yml')]
     it 'works in :en' do
-      pagy = Pagy::Calendar.send(:create, :month,
-                                 period: [Time.zone.local(2021, 10, 21, 13, 18, 23, 0),
-                                          Time.zone.local(2023, 11, 13, 15, 43, 40, 0)],
-                                 page: 3, format: '%B, %A')
+      pagy = Pagy::Offset::Calendar.send(:create, :month,
+                                         period: [Time.zone.local(2021, 10, 21, 13, 18, 23, 0),
+                                                  Time.zone.local(2023, 11, 13, 15, 43, 40, 0)],
+                                         page: 3, format: '%B, %A')
       _(pagy.label).must_equal "December, Wednesday"
       _(pagy.label(locale: :de)).must_equal "Dezember, Mittwoch"
       _(pagy.label(format: '%b')).must_equal "Dec"
diff --git a/test/pagy/extras/i18n_extra_test.rb b/test/pagy/extras/i18n_extra_test.rb
index 3c01131e7..48aa1a9c7 100644
--- a/test/pagy/extras/i18n_extra_test.rb
+++ b/test/pagy/extras/i18n_extra_test.rb
@@ -26,10 +26,10 @@
 
   describe '#pagy_info with I18n' do
     it 'renders info' do
-      _(app.pagy_info(Pagy.new(count: 0))).must_rematch :info_0
-      _(app.pagy_info(Pagy.new(count: 1))).must_rematch :info_1
-      _(app.pagy_info(Pagy.new(count: 13))).must_rematch :info_13
-      _(app.pagy_info(Pagy.new(count: 100, page: 3))).must_rematch :info_100
+      _(app.pagy_info(Pagy::Offset.new(count: 0))).must_rematch :info_0
+      _(app.pagy_info(Pagy::Offset.new(count: 1))).must_rematch :info_1
+      _(app.pagy_info(Pagy::Offset.new(count: 13))).must_rematch :info_13
+      _(app.pagy_info(Pagy::Offset.new(count: 100, page: 3))).must_rematch :info_100
     end
   end
 end
diff --git a/test/pagy/extras/javascripts_test.rb b/test/pagy/extras/javascripts_test.rb
index 4db49e2d3..fe9400fff 100644
--- a/test/pagy/extras/javascripts_test.rb
+++ b/test/pagy/extras/javascripts_test.rb
@@ -2,7 +2,6 @@
 
 require_relative '../../test_helper'
 require 'pagy/extras/calendar'
-require 'pagy/frontend/javascript'
 
 require_relative '../../mock_helpers/app'
 
@@ -18,18 +17,18 @@
 
     describe "pagy_data #{test}" do
       it "runs #{test}" do
-        _(app.pagy_data(Pagy.new(count: 10), :test_function, 'some-string', 123, true)).must_rematch :data_1
+        _(app.pagy_data(Pagy::Offset.new(count: 10), :test_function, 'some-string', 123, true)).must_rematch :data_1
       end
     end
     describe "Calendar sequels and label_sequels #{test}" do
       it 'generate the labels for the sequels' do
         steps = { 0 => 5, 600 => 7 }
-        pagy = Pagy::Calendar.send(:create, :month,
-                                   period: [Time.zone.local(2021, 10, 21, 13, 18, 23, 0),
-                                            Time.zone.local(2023, 11, 13, 15, 43, 40, 0)],
-                                   steps: steps,
-                                   ends: true,   # to hit the :gap condition in the calendar sequels override
-                                   page: 6)
+        pagy = Pagy::Offset::Calendar.send(:create, :month,
+                                           period: [Time.zone.local(2021, 10, 21, 13, 18, 23, 0),
+                                                    Time.zone.local(2023, 11, 13, 15, 43, 40, 0)],
+                                           steps: steps,
+                                           ends: true,   # to hit the :gap condition in the calendar sequels override
+                                           page: 6)
         _(pagy.sequels).must_rematch :sequels
       end
     end
diff --git a/test/pagy/extras/jsonapi_test.rb b/test/pagy/extras/jsonapi_test.rb
index 2ca77e162..8015ef618 100644
--- a/test/pagy/extras/jsonapi_test.rb
+++ b/test/pagy/extras/jsonapi_test.rb
@@ -3,7 +3,6 @@
 require_relative '../../test_helper'
 require 'pagy/extras/limit'
 require 'pagy/extras/jsonapi'
-require 'pagy/extras/keyset'
 
 require_relative '../../mock_helpers/collection'
 require_relative '../../files/models'
diff --git a/test/pagy/extras/keyset_for_ui_test.rb b/test/pagy/extras/keyset_augmented.rb
similarity index 80%
rename from test/pagy/extras/keyset_for_ui_test.rb
rename to test/pagy/extras/keyset_augmented.rb
index 3d9b9922d..97d3b741c 100644
--- a/test/pagy/extras/keyset_for_ui_test.rb
+++ b/test/pagy/extras/keyset_augmented.rb
@@ -1,22 +1,21 @@
 # frozen_string_literal: true
 
 require_relative '../../test_helper'
-require 'pagy/extras/keyset_for_ui'
 require 'pagy/extras/limit'
 
 require_relative '../../files/models'
 require_relative '../../mock_helpers/app'
 
-describe 'pagy/extras/keyset_for_ui' do
+describe 'Augmented Backend' do
   [Pet, PetSequel].each do |model|
-    describe 'pagy_keyset_for_ui' do
+    describe 'pagy_augmented' do
       it 'works for page 1' do
         app           = MockApp.new(params: {})
-        pagy, records = app.send(:pagy_keyset_for_ui,
+        pagy, records = app.send(:pagy_keyset_augmented,
                                  model.order(:id),
                                  tuple_comparison: true,
                                  limit:            10)
-        _(pagy).must_be_kind_of Pagy::KeysetForUI
+        _(pagy).must_be_kind_of Pagy::Keyset::Augmented
         _(records.size).must_equal 10
         _(pagy.next).must_equal 2
         _(pagy.update).must_equal [nil, [1, 1, [10]]]
@@ -24,11 +23,11 @@
       it 'works for page 2' do
         app           = MockApp.new(params: {page: Pagy::B64.urlsafe_encode(['ppp', 'key', 2, 2, [10]].to_json)},
                                     cookie: 'pagy=ppp')
-        pagy, records = app.send(:pagy_keyset_for_ui,
+        pagy, records = app.send(:pagy_keyset_augmented,
                                  model.order(:id),
                                  tuple_comparison: true,
                                  limit:            10)
-        _(pagy).must_be_kind_of Pagy::KeysetForUI
+        _(pagy).must_be_kind_of Pagy::Keyset::Augmented
         _(records.size).must_equal 10
         _(records.first.id).must_equal 11
         _(pagy.next).must_equal 3
@@ -37,23 +36,23 @@
       it 'reset pagination for missing cookie' do
         app           = MockApp.new(params: {page: Pagy::B64.urlsafe_encode(['zzz', 'key', 2, 2, [10]].to_json)},
                                     cookie: 'pagy=ppp')
-        pagy, records = app.send(:pagy_keyset_for_ui,
+        pagy, records = app.send(:pagy_keyset_augmented,
                                  model.order(:id),
                                  tuple_comparison: true,
                                  limit:            10)
-        _(pagy).must_be_kind_of Pagy::KeysetForUI
+        _(pagy).must_be_kind_of Pagy::Keyset::Augmented
         _(records.size).must_equal 10
         _(pagy.next).must_equal 2
         _(pagy.update).must_equal [nil, [1, 1, [10]]]
       end
       it 'fallback to Countless if page param is a number' do
         app           = MockApp.new(cookie: 'pagy=ppp')
-        pagy, records = app.send(:pagy_keyset_for_ui,
+        pagy, records = app.send(:pagy_keyset_augmented,
                                  model.order(:id),
                                  page: 2,
                                  tuple_comparison: true,
                                  limit:            10)
-        _(pagy).must_be_kind_of Pagy::Countless
+        _(pagy).must_be_kind_of Pagy::Offset::Countless
         _(records.size).must_equal 10
         _(records.first.id).must_equal 11
         _(pagy.next).must_equal 3
@@ -61,11 +60,11 @@
       it 'works for page 5' do
         app           = MockApp.new(params: {page: Pagy::B64.urlsafe_encode(['ppp', 'key', 5, 5, [40]].to_json)},
                                     cookie: 'pagy=ppp')
-        pagy, records = app.send(:pagy_keyset_for_ui,
+        pagy, records = app.send(:pagy_keyset_augmented,
                                  model.order(:id),
                                  tuple_comparison: true,
                                  limit:            10)
-        _(pagy).must_be_kind_of Pagy::KeysetForUI
+        _(pagy).must_be_kind_of Pagy::Keyset::Augmented
         _(records.size).must_equal 10
         _(records.first.id).must_equal 41
         _(pagy.next).must_be_nil
diff --git a/test/pagy/extras/keyset_test.rb b/test/pagy/extras/keyset_test.rb
index c928b103f..e526809e9 100644
--- a/test/pagy/extras/keyset_test.rb
+++ b/test/pagy/extras/keyset_test.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative '../../test_helper'
-require 'pagy/extras/keyset'
 require 'pagy/extras/limit'
 
 require_relative '../../files/models'
diff --git a/test/pagy/extras/limit_test.rb b/test/pagy/extras/limit_test.rb
index cc8377cb6..040f80233 100644
--- a/test/pagy/extras/limit_test.rb
+++ b/test/pagy/extras/limit_test.rb
@@ -2,7 +2,6 @@
 
 require_relative '../../test_helper'
 
-require 'pagy/extras/countless'
 require 'pagy/extras/arel'
 require 'pagy/extras/array'
 require 'pagy/extras/limit'
@@ -115,31 +114,31 @@ def test_limit_vars_params(limit, vars, params)
   describe 'view_methods' do
     describe '#pagy_page_url' do
       it 'renders basic url' do
-        pagy = Pagy.new count: 1000, page: 3
+        pagy = Pagy::Offset.new count: 1000, page: 3
         _(app.pagy_page_url(pagy, 5)).must_equal '/foo?page=5&limit=20'
       end
       it 'renders basic url and limit var' do
-        pagy = Pagy.new count: 1000, page: 3, limit: 50
+        pagy = Pagy::Offset.new count: 1000, page: 3, limit: 50
         _(app.pagy_page_url(pagy, 5)).must_equal '/foo?page=5&limit=50'
       end
       it 'renders url with limit_sym' do
-        pagy = Pagy.new count: 1000, page: 3, limit_sym: :custom
+        pagy = Pagy::Offset.new count: 1000, page: 3, limit_sym: :custom
         _(app.pagy_page_url(pagy, 5)).must_equal '/foo?page=5&custom=20'
       end
       it 'renders url with fragment' do
-        pagy = Pagy.new count: 1000, page: 3
+        pagy = Pagy::Offset.new count: 1000, page: 3
         _(app.pagy_page_url(pagy, 6, fragment: '#fragment')).must_equal '/foo?page=6&limit=20#fragment'
       end
       it 'renders url with params and fragment' do
-        pagy = Pagy.new count: 1000, page: 3, params: { a: 3, b: 4 }, limit: 40
+        pagy = Pagy::Offset.new count: 1000, page: 3, params: { a: 3, b: 4 }, limit: 40
         _(app.pagy_page_url(pagy, 5, fragment: '#fragment')).must_equal "/foo?page=5&a=3&b=4&limit=40#fragment"
       end
     end
     it 'renders limit selector' do
-      pagy = Pagy.new count: 1000, page: 3
+      pagy = Pagy::Offset.new count: 1000, page: 3
       _(app.pagy_limit_selector_js(pagy)).must_rematch :selector_1
       _(app.pagy_limit_selector_js(pagy, id: 'test-id', item_name: 'products')).must_rematch :selector_2
-      pagy = Pagy.new count: 1000, page: 3, limit_extra: false
+      pagy = Pagy::Offset.new count: 1000, page: 3, limit_extra: false
       _(app.pagy_limit_selector_js(pagy, id: 'test-id')).must_equal ''
     end
   end
diff --git a/test/pagy/extras/meilisearch_test.rb b/test/pagy/extras/meilisearch_test.rb
index fb285a093..928dd6cfa 100644
--- a/test/pagy/extras/meilisearch_test.rb
+++ b/test/pagy/extras/meilisearch_test.rb
@@ -29,7 +29,7 @@
       end
       it 'paginates response with defaults' do
         pagy, results = app.send(:pagy_meilisearch, MockMeilisearch::Model.pagy_search('a'))
-        _(pagy).must_be_instance_of Pagy
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal Pagy::DEFAULT[:limit]
         _(pagy.page).must_equal app.params[:page].to_i
@@ -39,7 +39,7 @@
       it 'paginates with vars' do
         pagy, results = app.send(:pagy_meilisearch, MockMeilisearch::Model.pagy_search('b'),
                                  page: 2, limit: 10, anchor_string: 'X')
-        _(pagy).must_be_instance_of Pagy
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal 10
         _(pagy.page).must_equal 2
@@ -50,7 +50,7 @@
       it 'paginates with overflow' do
         pagy, results = app.send(:pagy_meilisearch, MockMeilisearch::Model.pagy_search('b'),
                                  page: 200, limit: 10, anchor_string: 'X', overflow: :last_page)
-        _(pagy).must_be_instance_of Pagy
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal 10
         _(pagy.page).must_equal 100
@@ -62,16 +62,16 @@
     describe 'new_from_meilisearch' do
       it 'paginates results with defaults' do
         results = MockMeilisearch::Model.ms_search('a')
-        pagy    = Pagy.new_from_meilisearch(results)
-        _(pagy).must_be_instance_of Pagy
+        pagy    = Pagy::Offset.new_from_meilisearch(results)
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal 10
         _(pagy.page).must_equal 1
       end
       it 'paginates results with vars' do
         results = MockMeilisearch::Model.ms_search('b', hits_per_page: 15, page: 3)
-        pagy    = Pagy.new_from_meilisearch(results, anchor_string: 'X')
-        _(pagy).must_be_instance_of Pagy
+        pagy    = Pagy::Offset.new_from_meilisearch(results, anchor_string: 'X')
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal 15
         _(pagy.page).must_equal 3
diff --git a/test/pagy/extras/metadata_test.rb b/test/pagy/extras/metadata_test.rb
index a4f507f5d..d2faedc6e 100644
--- a/test/pagy/extras/metadata_test.rb
+++ b/test/pagy/extras/metadata_test.rb
@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../../test_helper'
-require 'pagy/frontend/javascript'       # include :sequels in DEFAULT[:metadata]
 require 'pagy/extras/calendar'
-require 'pagy/extras/countless'
 require 'pagy/extras/metadata'
 
 require_relative '../../mock_helpers/collection'
@@ -19,10 +17,6 @@
     it 'defines all metadata' do
       _(Pagy::DEFAULT[:metadata]).must_rematch :metadata
     end
-    it 'returns the full pagy metadata' do
-      pagy, _records = app.send(:pagy, @collection, metadata: (Pagy::DEFAULT[:metadata]) + [:sequels])
-      _(app.send(:pagy_metadata, pagy)).must_rematch :metadata
-    end
     it 'checks for unknown metadata' do
       pagy, _records = app.send(:pagy, @collection, metadata: %i[page unknown_key])
       _ { app.send(:pagy_metadata, pagy) }.must_raise Pagy::VariableError
@@ -33,17 +27,17 @@
     end
   end
 
-  describe '#pagy_metadata for Pagy::Calendar' do
+  describe '#pagy_metadata for Pagy::Offset::Calendar' do
     Time.zone = 'EST'
     def calendar_app(**opts)
       MockApp::Calendar.new(**opts)
     end
-    it 'checks for unknown metadata for Pagy::Calendar' do
+    it 'checks for unknown metadata for Pagy::Offset::Calendar' do
       calendar, _pagy, _records = calendar_app.send(:pagy_calendar, Event.all,
                                                     year: { metadata: %i[page unknown_key] })
       _ { calendar_app.send(:pagy_metadata, calendar[:year]) }.must_raise Pagy::VariableError
     end
-    it 'returns only specific metadata for Pagy::Calendar' do
+    it 'returns only specific metadata for Pagy::Offset::Calendar' do
       calendar, _pagy, _records = calendar_app(params: { month_page: 3 })
                                   .send(:pagy_calendar, Event.all,
                                         month: { metadata: %i[url_template page from to prev next pages] })
diff --git a/test/pagy/extras/metadata_test.rb.yaml b/test/pagy/extras/metadata_test.rb.yaml
index fe4cbb3e2..c40f4766a 100644
--- a/test/pagy/extras/metadata_test.rb.yaml
+++ b/test/pagy/extras/metadata_test.rb.yaml
@@ -1,79 +1,20 @@
 ---
-pagy/extras/metadata___pagy_metadata_for_Pagy_test_0002_returns_the_full_pagy_metadata:
-  :metadata:
-    :url_template: "/foo?page=P "
-    :first_url: "/foo?page=1"
-    :prev_url: "/foo?page=2"
-    :page_url: "/foo?page=3"
-    :next_url: "/foo?page=4"
-    :last_url: "/foo?page=50"
-    :count: 1000
-    :page: 3
-    :limit: 20
-    :vars:
-      :count_args:
-      - :all
-      :ends: true
-      :limit: 20
-      :outset: 0
-      :page: 3
-      :page_sym: :page
-      :size: 7
-      :countless_minimal: false
-      :metadata:
-      - :url_template
-      - :first_url
-      - :prev_url
-      - :page_url
-      - :next_url
-      - :last_url
-      - :count
-      - :page
-      - :limit
-      - :vars
-      - :pages
-      - :last
-      - :in
-      - :from
-      - :to
-      - :prev
-      - :next
-      - :series
-      - :sequels
-      :count: 1000
-    :pages: 50
-    :last: 50
-    :in: 20
-    :from: 41
-    :to: 60
-    :prev: 2
-    :next: 4
-    :series:
-    - 1
-    - 2
-    - '3'
-    - 4
-    - 5
-    - :gap
-    - 50
-    :sequels:
-    - - 0
-    - - - 1
-        - 2
-        - '3'
-        - 4
-        - 5
-        - :gap
-        - 50
-    -
-pagy/extras/metadata___pagy_metadata_for_Pagy_test_0004_returns_only_specific_metadata:
-  :metadata:
-    :url_template: "/foo?page=P "
+? pagy/extras/metadata___pagy_metadata_for_Pagy__Offset__Calendar_test_0002_returns_only_specific_metadata_for_Pagy__Offset__Calendar
+: :metadata:
+    :url_template: "/foo?month_page=P "
     :page: 3
-    :count: 1000
+    :from: !ruby/object:ActiveSupport::TimeWithZone
+      utc: 2021-12-01 05:00:00.000000000 Z
+      zone: &1 !ruby/object:ActiveSupport::TimeZone
+        name: EST
+      time: 2021-12-01 00:00:00.000000000 Z
+    :to: !ruby/object:ActiveSupport::TimeWithZone
+      utc: 2022-01-01 05:00:00.000000000 Z
+      zone: *1
+      time: 2022-01-01 00:00:00.000000000 Z
     :prev: 2
     :next: 4
-    :pages: 50
+    :pages: 26
 pagy/extras/metadata___pagy_metadata_for_Pagy_test_0001_defines_all_metadata:
   :metadata:
   - :url_template
@@ -94,19 +35,12 @@ pagy/extras/metadata___pagy_metadata_for_Pagy_test_0001_defines_all_metadata:
   - :prev
   - :next
   - :series
-pagy/extras/metadata___pagy_metadata_for_Pagy__Calendar_test_0002_returns_only_specific_metadata_for_Pagy__Calendar:
+  - :sequels
+pagy/extras/metadata___pagy_metadata_for_Pagy_test_0003_returns_only_specific_metadata:
   :metadata:
-    :url_template: "/foo?month_page=P "
+    :url_template: "/foo?page=P "
     :page: 3
-    :from: !ruby/object:ActiveSupport::TimeWithZone
-      utc: 2021-12-01 05:00:00.000000000 Z
-      zone: &1 !ruby/object:ActiveSupport::TimeZone
-        name: EST
-      time: 2021-12-01 00:00:00.000000000 Z
-    :to: !ruby/object:ActiveSupport::TimeWithZone
-      utc: 2022-01-01 05:00:00.000000000 Z
-      zone: *1
-      time: 2022-01-01 00:00:00.000000000 Z
+    :count: 1000
     :prev: 2
     :next: 4
-    :pages: 26
+    :pages: 50
diff --git a/test/pagy/extras/overflow_test.rb b/test/pagy/extras/overflow_test.rb
index 067850bd1..3c1abf894 100644
--- a/test/pagy/extras/overflow_test.rb
+++ b/test/pagy/extras/overflow_test.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require_relative '../../test_helper'
-require 'pagy/calendar'
-require 'pagy/countless'
+require 'pagy/offset/calendar'
+require 'pagy/offset/countless'
 require 'pagy/extras/overflow'
 
 Time.zone = 'EST'
@@ -16,9 +16,9 @@
   let(:countless_vars) { { page: 100, limit: 10 } }
   let(:calendar_vars)  { { period: PERIOD, page: 100 } }
   before do
-    @pagy           = Pagy.new(**pagy_vars)
-    @pagy_calendar  = Pagy::Calendar::Day.new(**calendar_vars)
-    @pagy_countless = Pagy::Countless.new(**countless_vars).finalize(0)
+    @pagy           = Pagy::Offset.new(**pagy_vars)
+    @pagy_calendar  = Pagy::Offset::Calendar::Day.new(**calendar_vars)
+    @pagy_countless = Pagy::Offset::Countless.new(**countless_vars).finalize(0)
   end
 
   describe "variables" do
@@ -34,16 +34,16 @@
       _(@pagy_countless).must_be :overflow?
     end
     it 'is not overflow?' do
-      _(Pagy.new(**pagy_vars, page: 2)).wont_be :overflow?
-      _(Pagy::Countless.new(**pagy_vars, page: 2)).wont_be :overflow?
-      _(Pagy::Calendar::Day.new(**calendar_vars, page: 2)).wont_be :overflow?
+      _(Pagy::Offset.new(**pagy_vars, page: 2)).wont_be :overflow?
+      _(Pagy::Offset::Countless.new(**pagy_vars, page: 2)).wont_be :overflow?
+      _(Pagy::Offset::Calendar::Day.new(**calendar_vars, page: 2)).wont_be :overflow?
     end
   end
 
   describe '#initialize' do
     it 'works in :last_page mode in Pagy' do
-      pagy = Pagy.new(**pagy_vars, overflow: :last_page)
-      _(pagy).must_be_instance_of Pagy
+      pagy = Pagy::Offset.new(**pagy_vars, overflow: :last_page)
+      _(pagy).must_be_instance_of Pagy::Offset
       _(pagy.pages).must_equal 11
       _(pagy.page).must_equal pagy.last
       _(pagy.vars[:page]).must_equal 100
@@ -53,9 +53,9 @@
       _(pagy.to).must_equal 103
       _(pagy.prev).must_equal 10
     end
-    it 'works in :last_page mode in Pagy::Calendar' do
-      pagy = Pagy::Calendar::Day.new(**calendar_vars, overflow: :last_page)
-      _(pagy).must_be_instance_of Pagy::Calendar::Day
+    it 'works in :last_page mode in Pagy::Offset::Calendar' do
+      pagy = Pagy::Offset::Calendar::Day.new(**calendar_vars, overflow: :last_page)
+      _(pagy).must_be_instance_of Pagy::Offset::Calendar::Day
       _(pagy.pages).must_equal 11
       _(pagy.page).must_equal pagy.last
       _(pagy.vars[:page]).must_equal 100
@@ -64,12 +64,12 @@
       _(pagy.prev).must_equal 10
     end
     it 'raises OverflowError in :exception mode' do
-      _ { Pagy.new(**pagy_vars, overflow: :exception) }.must_raise Pagy::OverflowError
-      _ { Pagy::Calendar::Day.new(**calendar_vars, overflow: :exception) }.must_raise Pagy::OverflowError
-      _ { Pagy::Countless.new(**countless_vars, overflow: :exception).finalize(0) }.must_raise Pagy::OverflowError
+      _ { Pagy::Offset.new(**pagy_vars, overflow: :exception) }.must_raise Pagy::OverflowError
+      _ { Pagy::Offset::Calendar::Day.new(**calendar_vars, overflow: :exception) }.must_raise Pagy::OverflowError
+      _ { Pagy::Offset::Countless.new(**countless_vars, overflow: :exception).finalize(0) }.must_raise Pagy::OverflowError
     end
     it 'works in :empty_page mode in Pagy' do
-      pagy = Pagy.new(**pagy_vars, overflow: :empty_page)
+      pagy = Pagy::Offset.new(**pagy_vars, overflow: :empty_page)
       _(pagy.page).must_equal 100
       _(pagy.offset).must_equal 990
       _(pagy.limit).must_equal 10
@@ -78,19 +78,19 @@
       _(pagy.to).must_equal 0
       _(pagy.prev).must_equal pagy.last
     end
-    it 'works in :empty_page mode in Pagy::Calendar' do
-      pagy = Pagy::Calendar::Day.new(**calendar_vars, overflow: :empty_page)
+    it 'works in :empty_page mode in Pagy::Offset::Calendar' do
+      pagy = Pagy::Offset::Calendar::Day.new(**calendar_vars, overflow: :empty_page)
       _(pagy.page).must_equal 100
       _(pagy.from).must_equal pagy.instance_variable_get(:@final)
       _(pagy.to).must_equal pagy.instance_variable_get(:@final)
       _(pagy.prev).must_equal pagy.last
-      pagy = Pagy::Calendar::Day.new(**calendar_vars, overflow: :empty_page, order: :desc)
+      pagy = Pagy::Offset::Calendar::Day.new(**calendar_vars, overflow: :empty_page, order: :desc)
       _(pagy.page).must_equal 100
       _(pagy.from).must_equal pagy.instance_variable_get(:@initial)
       _(pagy.to).must_equal pagy.instance_variable_get(:@initial)
       _(pagy.prev).must_equal pagy.last
     end
-    it 'works in :empty_page mode in Pagy::Countless' do
+    it 'works in :empty_page mode in Pagy::Offset::Countless' do
       pagy = @pagy_countless
       _(pagy.page).must_equal 100
       _(pagy.offset).must_equal 0
@@ -101,26 +101,26 @@
       _(pagy.prev).must_be_nil
     end
     it 'raises Pagy::VariableError' do
-      _ { Pagy.new(**pagy_vars, overflow: :unknown) }.must_raise Pagy::VariableError
-      _ { Pagy::Calendar::Day.new(**calendar_vars, overflow: :unknown) }.must_raise Pagy::VariableError
-      _ { Pagy::Countless.new(**countless_vars, overflow: :unknown).finalize(0) }.must_raise Pagy::VariableError
+      _ { Pagy::Offset.new(**pagy_vars, overflow: :unknown) }.must_raise Pagy::VariableError
+      _ { Pagy::Offset::Calendar::Day.new(**calendar_vars, overflow: :unknown) }.must_raise Pagy::VariableError
+      _ { Pagy::Offset::Countless.new(**countless_vars, overflow: :unknown).finalize(0) }.must_raise Pagy::VariableError
     end
   end
 
   describe "#series singleton for :empty_page mode" do
     it 'computes series for empty page for Pagy' do
-      pagy = Pagy.new(**pagy_vars, overflow: :empty_page)
+      pagy = Pagy::Offset.new(**pagy_vars, overflow: :empty_page)
       series = pagy.series
       _(series).must_equal [1, :gap, 7, 8, 9, 10, 11]
       _(pagy.page).must_equal 100
     end
-    it 'computes series for empty page for Pagy::Calendar' do
-      pagy = Pagy::Calendar::Day.new(**calendar_vars, overflow: :empty_page)
+    it 'computes series for empty page for Pagy::Offset::Calendar' do
+      pagy = Pagy::Offset::Calendar::Day.new(**calendar_vars, overflow: :empty_page)
       series = pagy.series
       _(series).must_equal([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11])
       _(pagy.page).must_equal 100
     end
-    it 'computes empty series for Pagy::Countless' do
+    it 'computes empty series for Pagy::Offset::Countless' do
       series = @pagy_countless.series
       _(series).must_equal []
       _(@pagy_countless.page).must_equal 100
diff --git a/test/pagy/extras/pagy_test.rb b/test/pagy/extras/pagy_test.rb
index 2a065f560..bc5cc6de1 100644
--- a/test/pagy/extras/pagy_test.rb
+++ b/test/pagy/extras/pagy_test.rb
@@ -18,7 +18,7 @@
   end
 
   describe "#pagy#{PREFIX}_nav_js" do
-    it 'renders single and multiple pages when used with Pagy::Countless' do
+    it 'renders single and multiple pages when used with Pagy::Offset::Countless' do
       nav_js_countless_tests(PREFIX)
     end
     it 'renders first, intermediate and last pages with required steps' do
@@ -36,8 +36,8 @@ def self.tests_for(method, page_finalize, **others)
     page_finalize.each do |page, finalize|
       it "renders the #{method} for page #{page}" do
         app = MockApp.new
-        pagy = Pagy.new count: 1000, page: page
-        pagy_countless = Pagy::Countless.new(page: page).finalize(finalize)
+        pagy = Pagy::Offset.new count: 1000, page: page
+        pagy_countless = Pagy::Offset::Countless.new(page: page).finalize(finalize)
         _(app.send(method, pagy)).must_rematch :r1
         _(app.send(method, pagy_countless)).must_rematch :r2
         _(app.send(method, pagy, **others)).must_rematch :r3
diff --git a/test/pagy/extras/pagy_test.rb.yaml b/test/pagy/extras/pagy_test.rb.yaml
index 301da6ce2..6af38fdc1 100644
--- a/test/pagy/extras/pagy_test.rb.yaml
+++ b/test/pagy/extras/pagy_test.rb.yaml
@@ -206,3 +206,10 @@ pagy/extras/pagy___pagy_prev_a_test_0003_renders_the_pagy_prev_a_for_page_6:
   :r2: <a href="/foo?page=5" aria-label="Previous">&lt;</a>
   :r3: <a href="/foo?page=5" aria-label="My prev page">PREV</a>
   :r4: <a href="/foo?page=5" aria-label="My prev page">PREV</a>
+pagy/extras/pagy___pagy_nav_js_test_0001_renders_single_and_multiple_pages_when_used_with_Pagy__Offset__Countless:
+  :plain_1_0: <nav class="pagy nav-js" aria-label="Page" data-pagy="WyJuaiIsWyI8YSByb2xlPVwibGlua1wiIGFyaWEtZGlzYWJsZWQ9XCJ0cnVlXCIgYXJpYS1sYWJlbD1cIlByZXZpb3VzXCI+Jmx0OzwvYT4iLCI8YSBocmVmPVwiL2Zvbz9wYWdlPVAgXCI+TDwvYT4iLCI8YSBjbGFzcz1cImN1cnJlbnRcIiByb2xlPVwibGlua1wiIGFyaWEtY3VycmVudD1cInBhZ2VcIiBhcmlhLWRpc2FibGVkPVwidHJ1ZVwiPkw8L2E+IiwiPGEgY2xhc3M9XCJnYXBcIiByb2xlPVwibGlua1wiIGFyaWEtZGlzYWJsZWQ9XCJ0cnVlXCI+JmhlbGxpcDs8L2E+IiwiPGEgcm9sZT1cImxpbmtcIiBhcmlhLWRpc2FibGVkPVwidHJ1ZVwiIGFyaWEtbGFiZWw9XCJOZXh0XCI+Jmd0OzwvYT4iXSxbMF0sW1siMSJdXSxudWxsXQ=="></nav>
+  :extras_1_0: <nav id="test-nav-id" class="pagy-rjs pagy nav-js" aria-label="Page"
+    data-pagy="WyJuaiIsWyI8YSByb2xlPVwibGlua1wiIGFyaWEtZGlzYWJsZWQ9XCJ0cnVlXCIgYXJpYS1sYWJlbD1cIlByZXZpb3VzXCI+Jmx0OzwvYT4iLCI8YSBhbmNob3Jfc3RyaW5nIGhyZWY9XCIvZm9vP3BhZ2U9UCBcIj5MPC9hPiIsIjxhIGNsYXNzPVwiY3VycmVudFwiIHJvbGU9XCJsaW5rXCIgYXJpYS1jdXJyZW50PVwicGFnZVwiIGFyaWEtZGlzYWJsZWQ9XCJ0cnVlXCI+TDwvYT4iLCI8YSBjbGFzcz1cImdhcFwiIHJvbGU9XCJsaW5rXCIgYXJpYS1kaXNhYmxlZD1cInRydWVcIj4maGVsbGlwOzwvYT4iLCI8YSByb2xlPVwibGlua1wiIGFyaWEtZGlzYWJsZWQ9XCJ0cnVlXCIgYXJpYS1sYWJlbD1cIk5leHRcIj4mZ3Q7PC9hPiJdLFs2MDAsMF0sW1siMSJdLFsiMSJdXSxudWxsXQ=="></nav>
+  :plain_2_23: <nav class="pagy nav-js" aria-label="Pages" data-pagy="WyJuaiIsWyI8YSBocmVmPVwiL2Zvbz9wYWdlPTFcIiBhcmlhLWxhYmVsPVwiUHJldmlvdXNcIj4mbHQ7PC9hPiIsIjxhIGhyZWY9XCIvZm9vP3BhZ2U9UCBcIj5MPC9hPiIsIjxhIGNsYXNzPVwiY3VycmVudFwiIHJvbGU9XCJsaW5rXCIgYXJpYS1jdXJyZW50PVwicGFnZVwiIGFyaWEtZGlzYWJsZWQ9XCJ0cnVlXCI+TDwvYT4iLCI8YSBjbGFzcz1cImdhcFwiIHJvbGU9XCJsaW5rXCIgYXJpYS1kaXNhYmxlZD1cInRydWVcIj4maGVsbGlwOzwvYT4iLCI8YSBocmVmPVwiL2Zvbz9wYWdlPTNcIiBhcmlhLWxhYmVsPVwiTmV4dFwiPiZndDs8L2E+Il0sWzBdLFtbMSwiMiIsM11dLG51bGxd"></nav>
+  :extras_2_23: <nav id="test-nav-id" class="pagy-rjs pagy nav-js" aria-label="Pages"
+    data-pagy="WyJuaiIsWyI8YSBhbmNob3Jfc3RyaW5nIGhyZWY9XCIvZm9vP3BhZ2U9MVwiIGFyaWEtbGFiZWw9XCJQcmV2aW91c1wiPiZsdDs8L2E+IiwiPGEgYW5jaG9yX3N0cmluZyBocmVmPVwiL2Zvbz9wYWdlPVAgXCI+TDwvYT4iLCI8YSBjbGFzcz1cImN1cnJlbnRcIiByb2xlPVwibGlua1wiIGFyaWEtY3VycmVudD1cInBhZ2VcIiBhcmlhLWRpc2FibGVkPVwidHJ1ZVwiPkw8L2E+IiwiPGEgY2xhc3M9XCJnYXBcIiByb2xlPVwibGlua1wiIGFyaWEtZGlzYWJsZWQ9XCJ0cnVlXCI+JmhlbGxpcDs8L2E+IiwiPGEgYW5jaG9yX3N0cmluZyBocmVmPVwiL2Zvbz9wYWdlPTNcIiBhcmlhLWxhYmVsPVwiTmV4dFwiPiZndDs8L2E+Il0sWzYwMCwwXSxbWzEsIjIiLDNdLFsxLCIyIiwzXV0sbnVsbF0="></nav>
diff --git a/test/pagy/extras/searchkick_test.rb b/test/pagy/extras/searchkick_test.rb
index 8a5a1d533..09604d5e8 100644
--- a/test/pagy/extras/searchkick_test.rb
+++ b/test/pagy/extras/searchkick_test.rb
@@ -46,7 +46,7 @@
       it 'paginates response with defaults' do
         pagy, response = app.send(:pagy_searchkick, MockSearchkick::Model.pagy_search('a') { 'B-' })
         results = response.results
-        _(pagy).must_be_instance_of Pagy
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal Pagy::DEFAULT[:limit]
         _(pagy.page).must_equal app.params[:page].to_i
@@ -55,7 +55,7 @@
       end
       it 'paginates results with defaults' do
         pagy, results = app.send(:pagy_searchkick, MockSearchkick::Model.pagy_search('a').results)
-        _(pagy).must_be_instance_of Pagy
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal Pagy::DEFAULT[:limit]
         _(pagy.page).must_equal app.params[:page].to_i
@@ -65,7 +65,7 @@
       it 'paginates with vars' do
         pagy, results = app.send(:pagy_searchkick, MockSearchkick::Model.pagy_search('b').results,
                                  page: 2, limit: 10, anchor_string: 'X')
-        _(pagy).must_be_instance_of Pagy
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal 10
         _(pagy.page).must_equal 2
@@ -76,7 +76,7 @@
       it 'paginates with overflow' do
         pagy, results = app.send(:pagy_searchkick, MockSearchkick::Model.pagy_search('b').results,
                                  page: 200, limit: 10, anchor_string: 'X', overflow: :last_page)
-        _(pagy).must_be_instance_of Pagy
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal 10
         _(pagy.page).must_equal 100
@@ -88,16 +88,16 @@
     describe 'new_from_searchkick' do
       it 'paginates results with defaults' do
         results = MockSearchkick::Model.search('a')
-        pagy    = Pagy.new_from_searchkick(results)
-        _(pagy).must_be_instance_of Pagy
+        pagy    = Pagy::Offset.new_from_searchkick(results)
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal 10
         _(pagy.page).must_equal 1
       end
       it 'paginates results with vars' do
         results = MockSearchkick::Model.search('b', page: 2, per_page: 15)
-        pagy    = Pagy.new_from_searchkick(results, anchor_string: 'X')
-        _(pagy).must_be_instance_of Pagy
+        pagy    = Pagy::Offset.new_from_searchkick(results, anchor_string: 'X')
+        _(pagy).must_be_instance_of Pagy::Offset
         _(pagy.count).must_equal 1000
         _(pagy.limit).must_equal 15
         _(pagy.page).must_equal 2
diff --git a/test/pagy/extras/size_test.rb b/test/pagy/extras/size_test.rb
index c508a1eeb..59a2cf8ff 100644
--- a/test/pagy/extras/size_test.rb
+++ b/test/pagy/extras/size_test.rb
@@ -23,7 +23,7 @@
     def series_for(page, *expected)
       expected.each_with_index do |value, index|
         vars = instance_variable_get(:"@vars#{index}").merge(page: page)
-        _(Pagy.new(**vars).series).must_equal value
+        _(Pagy::Offset.new(**vars).series).must_equal value
       end
     end
 
@@ -105,27 +105,27 @@ def series_for(page, *expected)
                  [1, 2, 3, :gap, 9, 10, "11"]
     end
     it 'computes series for count 0' do
-      _(Pagy.new(**@vars3, count: 0).series).must_equal ["1"]
+      _(Pagy::Offset.new(**@vars3, count: 0).series).must_equal ["1"]
     end
     it 'computes series for single page' do
-      _(Pagy.new(**@vars3, count: 8).series).must_equal ["1"]
+      _(Pagy::Offset.new(**@vars3, count: 8).series).must_equal ["1"]
     end
     it 'computes series for 1 of 2 pages' do
-      _(Pagy.new(**@vars3, count: 15).series).must_equal ["1", 2]
+      _(Pagy::Offset.new(**@vars3, count: 15).series).must_equal ["1", 2]
     end
     it 'computes series for 2 of 2 pages' do
-      _(Pagy.new(**@vars3, count: 15, page: 2).series).must_equal [1, "2"]
+      _(Pagy::Offset.new(**@vars3, count: 15, page: 2).series).must_equal [1, "2"]
     end
     it 'computes an empty series' do
-      _(Pagy.new(**@vars3, count: 100, size: []).series).must_equal []
+      _(Pagy::Offset.new(**@vars3, count: 100, size: []).series).must_equal []
     end
     it 'use super for non array size' do
-      _(Pagy.new(**@vars3, count: 100, size: 0).series).must_equal []
-      _(Pagy.new(**@vars3, count: 103, size: 7, page: 6).series).must_equal [1, :gap, 5, "6", 7, :gap, 11]
+      _(Pagy::Offset.new(**@vars3, count: 100, size: 0).series).must_equal []
+      _(Pagy::Offset.new(**@vars3, count: 103, size: 7, page: 6).series).must_equal [1, :gap, 5, "6", 7, :gap, 11]
     end
     it 'raises Pagy::Variable errors for wrong size' do
-      _ { Pagy.new(count: 100, page: 2, size: [1, 2, 3]).series }.must_raise Pagy::VariableError
-      _ { Pagy.new(count: 100, page: 2, size: [1, 2, 3, '4']).series }.must_raise Pagy::VariableError
+      _ { Pagy::Offset.new(count: 100, page: 2, size: [1, 2, 3]).series }.must_raise Pagy::VariableError
+      _ { Pagy::Offset.new(count: 100, page: 2, size: [1, 2, 3, '4']).series }.must_raise Pagy::VariableError
     end
   end
 end
diff --git a/test/pagy/extras/standalone_limit_test.rb b/test/pagy/extras/standalone_limit_test.rb
index 87e6a4f16..cff2ed108 100644
--- a/test/pagy/extras/standalone_limit_test.rb
+++ b/test/pagy/extras/standalone_limit_test.rb
@@ -11,13 +11,13 @@
 
   describe '#pagy_page_url' do
     it 'renders url with params and fragment' do
-      pagy = Pagy.new(count: 1000, page: 3, params: { a: 3, b: 4 })
+      pagy = Pagy::Offset.new(count: 1000, page: 3, params: { a: 3, b: 4 })
       _(app.pagy_page_url(pagy, 5, fragment: '#fragment')).must_equal "/foo?page=5&a=3&b=4&limit=20#fragment"
       _(app.pagy_page_url(pagy, 5, absolute: true, fragment: '#fragment')).must_equal "http://example.com:3000/foo?page=5&a=3&b=4&limit=20#fragment"
-      pagy = Pagy.new(count: 1000, page: 3, params: { a: [1, 2, 3] }, url: 'http://www.pagy-standalone.com/subdir')
+      pagy = Pagy::Offset.new(count: 1000, page: 3, params: { a: [1, 2, 3] }, url: 'http://www.pagy-standalone.com/subdir')
       _(app.pagy_page_url(pagy, 5, fragment: '#fragment')).must_equal "http://www.pagy-standalone.com/subdir?a%5B%5D=1&a%5B%5D=2&a%5B%5D=3&page=5&limit=20#fragment"
       _(app.pagy_page_url(pagy, 5, absolute: true, fragment: '#fragment')).must_equal "http://www.pagy-standalone.com/subdir?a%5B%5D=1&a%5B%5D=2&a%5B%5D=3&page=5&limit=20#fragment"
-      pagy = Pagy.new(count: 1000, page: 3, params: { a: nil }, url: '')
+      pagy = Pagy::Offset.new(count: 1000, page: 3, params: { a: nil }, url: '')
       _(app.pagy_page_url(pagy, 5, fragment: '#fragment')).must_equal "?a&page=5&limit=20#fragment"
       _(app.pagy_page_url(pagy, 5, absolute: true, fragment: '#fragment')).must_equal "?a&page=5&limit=20#fragment"
     end
diff --git a/test/pagy/extras/standalone_test.rb b/test/pagy/extras/standalone_test.rb
index 8d1e75f3d..bf05698ab 100644
--- a/test/pagy/extras/standalone_test.rb
+++ b/test/pagy/extras/standalone_test.rb
@@ -30,58 +30,58 @@ def params
 
   describe '#pagy_page_url' do
     it 'renders basic url' do
-      pagy = Pagy.new count: 1000, page: 3
+      pagy = Pagy::Offset.new count: 1000, page: 3
       _(app.pagy_page_url(pagy, 5)).must_equal '/foo?page=5'
       _(app.pagy_page_url(pagy, 5, absolute: true)).must_equal 'http://example.com:3000/foo?page=5'
-      pagy = Pagy.new count: 1000, page: 3, url: 'http://www.pagy-standalone.com/subdir'
+      pagy = Pagy::Offset.new count: 1000, page: 3, url: 'http://www.pagy-standalone.com/subdir'
       _(app.pagy_page_url(pagy, 5)).must_equal 'http://www.pagy-standalone.com/subdir?page=5'
       _(app.pagy_page_url(pagy, 5, absolute: true)).must_equal 'http://www.pagy-standalone.com/subdir?page=5'
-      pagy = Pagy.new count: 1000, page: 3, url: ''
+      pagy = Pagy::Offset.new count: 1000, page: 3, url: ''
       _(app.pagy_page_url(pagy, 5)).must_equal '?page=5'
       _(app.pagy_page_url(pagy, 5, absolute: true)).must_equal '?page=5'
     end
 
     it 'renders url with params' do
-      pagy = Pagy.new count: 1000, page: 3, params: { a: 3, b: 4 }
+      pagy = Pagy::Offset.new count: 1000, page: 3, params: { a: 3, b: 4 }
       _(app.pagy_page_url(pagy, 5)).must_equal '/foo?page=5&a=3&b=4'
       _(app.pagy_page_url(pagy, 5, absolute: true)).must_equal 'http://example.com:3000/foo?page=5&a=3&b=4'
-      pagy = Pagy.new count: 1000, page: 3, params: { a: 3, b: 4 }, url: 'http://www.pagy-standalone.com/subdir'
+      pagy = Pagy::Offset.new count: 1000, page: 3, params: { a: 3, b: 4 }, url: 'http://www.pagy-standalone.com/subdir'
       _(app.pagy_page_url(pagy, 5)).must_equal "http://www.pagy-standalone.com/subdir?a=3&b=4&page=5"
       _(app.pagy_page_url(pagy, 5, absolute: true)).must_equal "http://www.pagy-standalone.com/subdir?a=3&b=4&page=5"
-      pagy = Pagy.new count: 1000, page: 3, params: { a: 3, b: 4 }, url: ''
+      pagy = Pagy::Offset.new count: 1000, page: 3, params: { a: 3, b: 4 }, url: ''
       _(app.pagy_page_url(pagy, 5)).must_equal "?a=3&b=4&page=5"
       _(app.pagy_page_url(pagy, 5, absolute: true)).must_equal "?a=3&b=4&page=5"
     end
     it 'renders url with fragment' do
-      pagy = Pagy.new count: 1000, page: 3
+      pagy = Pagy::Offset.new count: 1000, page: 3
       _(app.pagy_page_url(pagy, 6, fragment: '#fragment')).must_equal '/foo?page=6#fragment'
       _(app.pagy_page_url(pagy, 6, absolute: true, fragment: '#fragment')).must_equal 'http://example.com:3000/foo?page=6#fragment'
-      pagy = Pagy.new count: 1000, page: 3, url: 'http://www.pagy-standalone.com/subdir'
+      pagy = Pagy::Offset.new count: 1000, page: 3, url: 'http://www.pagy-standalone.com/subdir'
       _(app.pagy_page_url(pagy, 6, fragment: '#fragment')).must_equal 'http://www.pagy-standalone.com/subdir?page=6#fragment'
       _(app.pagy_page_url(pagy, 6, absolute: true, fragment: '#fragment')).must_equal 'http://www.pagy-standalone.com/subdir?page=6#fragment'
-      pagy = Pagy.new count: 1000, page: 3, url: ''
+      pagy = Pagy::Offset.new count: 1000, page: 3, url: ''
       _(app.pagy_page_url(pagy, 6, fragment: '#fragment')).must_equal '?page=6#fragment'
       _(app.pagy_page_url(pagy, 6, absolute: true, fragment: '#fragment')).must_equal '?page=6#fragment'
     end
     it 'renders url with params and fragment' do
-      pagy = Pagy.new count: 1000, page: 3, params: { a: 3, b: 4 }
+      pagy = Pagy::Offset.new count: 1000, page: 3, params: { a: 3, b: 4 }
       _(app.pagy_page_url(pagy, 5, fragment: '#fragment')).must_equal '/foo?page=5&a=3&b=4#fragment'
       _(app.pagy_page_url(pagy, 5, absolute: true, fragment: '#fragment')).must_equal 'http://example.com:3000/foo?page=5&a=3&b=4#fragment'
-      pagy = Pagy.new count: 1000, page: 3, params: { a: [1, 2, 3] }, url: 'http://www.pagy-standalone.com/subdir'
+      pagy = Pagy::Offset.new count: 1000, page: 3, params: { a: [1, 2, 3] }, url: 'http://www.pagy-standalone.com/subdir'
       _(app.pagy_page_url(pagy, 5, fragment: '#fragment')).must_equal "http://www.pagy-standalone.com/subdir?a%5B%5D=1&a%5B%5D=2&a%5B%5D=3&page=5#fragment"
       _(app.pagy_page_url(pagy, 5, absolute: true, fragment: '#fragment')).must_equal "http://www.pagy-standalone.com/subdir?a%5B%5D=1&a%5B%5D=2&a%5B%5D=3&page=5#fragment"
-      pagy = Pagy.new count: 1000, page: 3, params: { a: nil }, url: ''
+      pagy = Pagy::Offset.new count: 1000, page: 3, params: { a: nil }, url: ''
       _(app.pagy_page_url(pagy, 5, fragment: '#fragment')).must_equal "?a&page=5#fragment"
       _(app.pagy_page_url(pagy, 5, absolute: true, fragment: '#fragment')).must_equal "?a&page=5#fragment"
     end
     it 'renders url with params lambda and fragment' do
-      pagy = Pagy.new count: 1000, page: 3, params: ->(p) { p.merge(a: 3, b: 4) }
+      pagy = Pagy::Offset.new count: 1000, page: 3, params: ->(p) { p.merge(a: 3, b: 4) }
       _(app.pagy_page_url(pagy, 5, fragment: '#fragment')).must_equal '/foo?page=5&a=3&b=4#fragment'
       _(app.pagy_page_url(pagy, 5, absolute: true, fragment: '#fragment')).must_equal 'http://example.com:3000/foo?page=5&a=3&b=4#fragment'
-      pagy = Pagy.new count: 1000, page: 3, params: ->(p) { p.merge(a: [1, 2, 3]) }, url: 'http://www.pagy-standalone.com/subdir'
+      pagy = Pagy::Offset.new count: 1000, page: 3, params: ->(p) { p.merge(a: [1, 2, 3]) }, url: 'http://www.pagy-standalone.com/subdir'
       _(app.pagy_page_url(pagy, 5, fragment: '#fragment')).must_equal "http://www.pagy-standalone.com/subdir?page=5&a%5B%5D=1&a%5B%5D=2&a%5B%5D=3#fragment"
       _(app.pagy_page_url(pagy, 5, absolute: true, fragment: '#fragment')).must_equal "http://www.pagy-standalone.com/subdir?page=5&a%5B%5D=1&a%5B%5D=2&a%5B%5D=3#fragment"
-      pagy = Pagy.new count: 1000, page: 3, params: ->(p) { p.merge(a: nil) }, url: ''
+      pagy = Pagy::Offset.new count: 1000, page: 3, params: ->(p) { p.merge(a: nil) }, url: ''
       _(app.pagy_page_url(pagy, 5, fragment: '#fragment')).must_equal "?page=5&a#fragment"
       _(app.pagy_page_url(pagy, 5, absolute: true, fragment: '#fragment')).must_equal "?page=5&a#fragment"
     end
diff --git a/test/pagy/frontend_test.rb b/test/pagy/frontend_test.rb
index 26df1bc3d..50a896a94 100644
--- a/test/pagy/frontend_test.rb
+++ b/test/pagy/frontend_test.rb
@@ -16,11 +16,11 @@ def i18n_load(*locales)
 describe 'pagy/frontend' do
   let(:app) { MockApp.new }
 
-  # #pagy_nav helper tests in the test/extras/pagy_test.rb
+  # #pagy_nav helper tests in the test/extras/offset_test.rb
 
   describe '#pagy_anchor' do
     it 'renders with extras' do
-      pagy = Pagy.new(count: 103, page: 1)
+      pagy = Pagy::Offset.new(count: 103, page: 1)
       _(app.pagy_anchor(pagy, anchor_string: 'X').call(3)).must_equal '<a X href="/foo?page=3">3</a>'
     end
   end
@@ -77,16 +77,16 @@ def i18n_load(*locales)
 
   describe '#pagy_info' do
     it 'renders without i18n key' do
-      _(app.pagy_info(Pagy.new(count: 0))).must_rematch :info_0
-      _(app.pagy_info(Pagy.new(count: 1))).must_rematch :info_1
-      _(app.pagy_info(Pagy.new(count: 13))).must_rematch :info_13
-      _(app.pagy_info(Pagy.new(count: 100, page: 3))).must_rematch :info_100
+      _(app.pagy_info(Pagy::Offset.new(count: 0))).must_rematch :info_0
+      _(app.pagy_info(Pagy::Offset.new(count: 1))).must_rematch :info_1
+      _(app.pagy_info(Pagy::Offset.new(count: 13))).must_rematch :info_13
+      _(app.pagy_info(Pagy::Offset.new(count: 100, page: 3))).must_rematch :info_100
     end
     it 'overrides the item_name and set id' do
-      _(app.pagy_info(Pagy.new(count: 0), id: 'pagy-info', item_name: 'Widgets')).must_rematch :info_0
-      _(app.pagy_info(Pagy.new(count: 1), id: 'pagy-info', item_name: 'Widget')).must_rematch :info_1
-      _(app.pagy_info(Pagy.new(count: 13), id: 'pagy-info', item_name: 'Widgets')).must_rematch :info_13
-      _(app.pagy_info(Pagy.new(count: 100, page: 3), id: 'pagy-info', item_name: 'Widgets')).must_rematch :info_100
+      _(app.pagy_info(Pagy::Offset.new(count: 0), id: 'pagy-info', item_name: 'Widgets')).must_rematch :info_0
+      _(app.pagy_info(Pagy::Offset.new(count: 1), id: 'pagy-info', item_name: 'Widget')).must_rematch :info_1
+      _(app.pagy_info(Pagy::Offset.new(count: 13), id: 'pagy-info', item_name: 'Widgets')).must_rematch :info_13
+      _(app.pagy_info(Pagy::Offset.new(count: 100, page: 3), id: 'pagy-info', item_name: 'Widgets')).must_rematch :info_100
     end
   end
 end
diff --git a/test/pagy/keyset_for_ui_test.rb b/test/pagy/keyset_for_ui_test.rb
index 0685611de..d67454812 100644
--- a/test/pagy/keyset_for_ui_test.rb
+++ b/test/pagy/keyset_for_ui_test.rb
@@ -4,26 +4,24 @@
 require_relative '../files/models'
 require_relative '../../gem/lib/pagy/b64'
 
-require 'pagy/keyset_for_ui'
-
 [Pet, PetSequel].each do |model|
   describe "Pagy Keyset with #{model}" do
     describe 'uses optional variables' do
       it 'use the :tuple_comparison' do
-        pagy    = Pagy::KeysetForUI.new(model.order(:animal, :name, :id),
-                                        page:             ['key', 2, 2, ["cat", "Ella", 18], nil],
-                                        limit:            10,
-                                        tuple_comparison: true)
+        pagy    = Pagy::Keyset::Augmented.new(model.order(:animal, :name, :id),
+                                              page:             ['key', 2, 2, ["cat", "Ella", 18], nil],
+                                              limit:            10,
+                                              tuple_comparison: true)
         records = pagy.records
         _(records.size).must_equal 10
         _(records.first.id).must_equal 13
         _(pagy.update).must_equal ['key', [2, 1, ["dog", "Denis", 44]]]
       end
       it 'uses :stringify_keyset_values' do
-        pagy = Pagy::KeysetForUI.new(model.order(:id),
-                                     page:                    ['key', 2, 2, [10], nil],
-                                     limit:                   10,
-                                     stringify_keyset_values: ->(attr) { attr.tap { |a| a[:id] = a[:id].to_s } })
+        pagy = Pagy::Keyset::Augmented.new(model.order(:id),
+                                           page:                    ['key', 2, 2, [10], nil],
+                                           limit:                   10,
+                                           stringify_keyset_values: ->(attr) { attr.tap { |a| a[:id] = a[:id].to_s } })
         _(pagy.next).must_equal(3)
         _(pagy.instance_variable_get(:@filter_args)).must_equal(id: 10)
         _(pagy.update).must_equal ['key', [2, 1, ["20"]]]
@@ -31,25 +29,25 @@
     end
     describe 'handles the page/cut' do
       it 'handles the page/cut for the first page' do
-        pagy = Pagy::KeysetForUI.new(model.order(:id),
-                                     limit: 10)
+        pagy = Pagy::Keyset::Augmented.new(model.order(:id),
+                                           limit: 10)
         _(pagy.instance_variable_get(:@cut)).must_be_nil
         _(pagy.next).must_equal 2
         _(pagy.update).must_equal [nil, [1, 1, [10]]]
       end
       it 'handles the page/cut for the second page' do
-        pagy = Pagy::KeysetForUI.new(model.order(:id),
-                                     page: ['key', 2,  2, [10]],
-                                     limit:   10)
+        pagy = Pagy::Keyset::Augmented.new(model.order(:id),
+                                           page: ['key', 2,  2, [10]],
+                                           limit:   10)
         _(pagy.instance_variable_get(:@filter_args)).must_equal(id: 10)
         _(pagy.records.first.id).must_equal 11
         _(pagy.next).must_equal 3
         _(pagy.update).must_equal ['key', [2, 1, [20]]]
       end
       it 'handles the page/cut for the last page' do
-        pagy = Pagy::KeysetForUI.new(model.order(:id),
-                                     page: ['key', 5, 5, [40]],
-                                     limit:   10)
+        pagy = Pagy::Keyset::Augmented.new(model.order(:id),
+                                           page: ['key', 5, 5, [40]],
+                                           limit:   10)
         _(pagy.instance_variable_get(:@filter_args)).must_equal(id: 40)
         _(pagy.records.first.id).must_equal 41
         _(pagy.next).must_be_nil
@@ -58,18 +56,18 @@
     end
     describe 'handles the jumping back' do
       it 'handles the assign_cut_args jump back to the first page' do
-        pagy = Pagy::KeysetForUI.new(model.order(:id),
-                                     page: ['key', 1, 3, nil, [10]], # last visited 2
-                                     limit: 10)
+        pagy = Pagy::Keyset::Augmented.new(model.order(:id),
+                                           page: ['key', 1, 3, nil, [10]], # last visited 2
+                                           limit: 10)
         _(pagy.instance_variable_get(:@prev_cutoff)).must_be_nil
         _(pagy.next).must_equal 2
         _(pagy.instance_variable_get(:@filter_args)).must_equal(cutoff_id: 10)
         _(pagy.update).must_equal ['key']
       end
       it 'handles the assign_cut_args jump back to the second page' do
-        pagy = Pagy::KeysetForUI.new(model.order(:id),
-                                     page: ['key', 2, 3, [20], [30]],
-                                     limit:   10)
+        pagy = Pagy::Keyset::Augmented.new(model.order(:id),
+                                           page: ['key', 2, 3, [20], [30]],
+                                           limit:   10)
         _(pagy.instance_variable_get(:@filter_args)).must_equal({ :id => 20, :cutoff_id => 30 })
         _(pagy.records.first.id).must_equal 21
         _(pagy.next).must_equal 3
@@ -80,7 +78,7 @@
     describe 'other requirements' do
       it 'adds the required columns to the selected values' do
         set  = model.order(:animal, :name, :id).select(:name)
-        pagy = Pagy::KeysetForUI.new(set, limit: 10)
+        pagy = Pagy::Keyset::Augmented.new(set, limit: 10)
         pagy.records
         set = pagy.instance_variable_get(:@set)
         _((model == Pet ? set.select_values : set.opts[:select]).sort).must_equal %i[animal id name]
@@ -105,13 +103,13 @@ def slurp_by_page(page: nil, records: [], &block)
           cutoff_list = [nil]
           pages       = slurp_by_page do |page|
             page ||= 1 # required only because page could be nil, and we want to pass the cutoff_list index
-            pagy = Pagy::KeysetForUI.new(set,
-                                         page: ['key',
-                                                page,
-                                                cutoff_list.size,
-                                                cutoff_list[page - 1],
-                                                cutoff_list[page]],
-                                         limit: 9)
+            pagy = Pagy::Keyset::Augmented.new(set,
+                                               page: ['key',
+                                                      page,
+                                                      cutoff_list.size,
+                                                      cutoff_list[page - 1],
+                                                      cutoff_list[page]],
+                                               limit: 9)
             cutoff_list << pagy.instance_variable_get(:@cutoff)
             { records: pagy.records, page: pagy.next }
           end
diff --git a/test/pagy/keyset_test.rb b/test/pagy/keyset_test.rb
index 936863f2e..9b66b7d40 100644
--- a/test/pagy/keyset_test.rb
+++ b/test/pagy/keyset_test.rb
@@ -4,8 +4,6 @@
 require_relative '../files/models'
 require_relative '../../gem/lib/pagy/b64'
 
-require 'pagy/keyset'
-
 [Pet, PetSequel].each do |model|
   describe "Pagy Keyset with #{model}" do
     describe 'initialize' do
diff --git a/test/pagy_test.rb b/test/pagy/offset_test.rb
similarity index 75%
rename from test/pagy_test.rb
rename to test/pagy/offset_test.rb
index f315bc9c6..7f1152271 100644
--- a/test/pagy_test.rb
+++ b/test/pagy/offset_test.rb
@@ -1,36 +1,36 @@
 # frozen_string_literal: true
 
-require_relative 'test_helper'
+require_relative '../test_helper'
 
 describe 'pagy' do
-  let(:pagy) { Pagy.new(count: 100, page: 4) }
+  let(:pagy) { Pagy::Offset.new(count: 100, page: 4) }
 
   describe '#initialize' do
     before do
       @vars = { count: 103, limit: 10 }
     end
     it 'initializes' do
-      _(pagy).must_be_instance_of Pagy
-      _(Pagy.new(count: 100)).must_be_instance_of Pagy
-      _(Pagy.new(count: '100')).must_be_instance_of Pagy
-      _(Pagy.new(count: 100, page: '2')).must_be_instance_of Pagy
-      _(Pagy.new(count: 100, page: '')).must_be_instance_of Pagy
-      _(Pagy.new(count: 100, limit: '10')).must_be_instance_of Pagy
-      _ { Pagy.new }.must_raise Pagy::VariableError
-      _ { Pagy.new(count: 0, page: -1) }.must_raise Pagy::VariableError
-      _ { Pagy.new(count: 100, page: 0) }.must_raise Pagy::VariableError
-      _ { Pagy.new(count: 100, page: {}) }.must_raise Pagy::VariableError
-      _ { Pagy.new(count: 100, page: 2, limit: 0) }.must_raise Pagy::VariableError
-      _ { Pagy.new(count: 100, page: '11') }.must_raise Pagy::OverflowError
-      _ { Pagy.new(count: 100, page: 12) }.must_raise Pagy::OverflowError
+      _(pagy).must_be_instance_of Pagy::Offset
+      _(Pagy::Offset.new(count: 100)).must_be_instance_of Pagy::Offset
+      _(Pagy::Offset.new(count: '100')).must_be_instance_of Pagy::Offset
+      _(Pagy::Offset.new(count: 100, page: '2')).must_be_instance_of Pagy::Offset
+      _(Pagy::Offset.new(count: 100, page: '')).must_be_instance_of Pagy::Offset
+      _(Pagy::Offset.new(count: 100, limit: '10')).must_be_instance_of Pagy::Offset
+      _ { Pagy::Offset.new }.must_raise Pagy::VariableError
+      _ { Pagy::Offset.new(count: 0, page: -1) }.must_raise Pagy::VariableError
+      _ { Pagy::Offset.new(count: 100, page: 0) }.must_raise Pagy::VariableError
+      _ { Pagy::Offset.new(count: 100, page: {}) }.must_raise Pagy::VariableError
+      _ { Pagy::Offset.new(count: 100, page: 2, limit: 0) }.must_raise Pagy::VariableError
+      _ { Pagy::Offset.new(count: 100, page: '11') }.must_raise Pagy::OverflowError
+      _ { Pagy::Offset.new(count: 100, page: 12) }.must_raise Pagy::OverflowError
       begin
-        Pagy.new(count: 100, page: 12)
+        Pagy::Offset.new(count: 100, page: 12)
       rescue Pagy::OverflowError => e
-        _(e.pagy).must_be_instance_of Pagy
+        _(e.pagy).must_be_instance_of Pagy::Offset
       end
     end
     it 'initializes count 0' do
-      pagy = Pagy.new(**@vars, count: 0)
+      pagy = Pagy::Offset.new(**@vars, count: 0)
       _(pagy.last).must_equal 1
       _(pagy.last).must_equal 1
       _(pagy.offset).must_equal 0
@@ -41,7 +41,7 @@
       _(pagy.next).must_be_nil
     end
     it 'initializes single page' do
-      pagy = Pagy.new(**@vars, count: 8)
+      pagy = Pagy::Offset.new(**@vars, count: 8)
       _(pagy.last).must_equal 1
       _(pagy.last).must_equal 1
       _(pagy.offset).must_equal 0
@@ -52,7 +52,7 @@
       _(pagy.next).must_be_nil
     end
     it 'initializes page 1 of 2' do
-      pagy = Pagy.new(**@vars, count: 15)
+      pagy = Pagy::Offset.new(**@vars, count: 15)
       _(pagy.last).must_equal 2
       _(pagy.last).must_equal 2
       _(pagy.offset).must_equal 0
@@ -63,7 +63,7 @@
       _(pagy.next).must_equal 2
     end
     it 'initializes page 2 of 2' do
-      pagy = Pagy.new(**@vars, count: 15, page: 2)
+      pagy = Pagy::Offset.new(**@vars, count: 15, page: 2)
       _(pagy.last).must_equal 2
       _(pagy.last).must_equal 2
       _(pagy.offset).must_equal 10
@@ -75,7 +75,7 @@
       _(pagy.next).must_be_nil
     end
     it 'initializes page 1' do
-      pagy = Pagy.new(**@vars, page: 1)
+      pagy = Pagy::Offset.new(**@vars, page: 1)
       _(pagy.count).must_equal 103
       _(pagy.last).must_equal 11
       _(pagy.last).must_equal 11
@@ -89,7 +89,7 @@
       _(pagy.next).must_equal 2
     end
     it 'initializes page 2' do
-      pagy = Pagy.new(**@vars, page: 2)
+      pagy = Pagy::Offset.new(**@vars, page: 2)
       _(pagy.count).must_equal 103
       _(pagy.last).must_equal 11
       _(pagy.last).must_equal 11
@@ -103,7 +103,7 @@
       _(pagy.next).must_equal 3
     end
     it 'initializes page 3' do
-      pagy = Pagy.new(**@vars, page: 3)
+      pagy = Pagy::Offset.new(**@vars, page: 3)
       _(pagy.count).must_equal 103
       _(pagy.last).must_equal 11
       _(pagy.last).must_equal 11
@@ -117,7 +117,7 @@
       _(pagy.next).must_equal 4
     end
     it 'initializes page 4' do
-      pagy = Pagy.new(**@vars, page: 4)
+      pagy = Pagy::Offset.new(**@vars, page: 4)
       _(pagy.count).must_equal 103
       _(pagy.last).must_equal 11
       _(pagy.last).must_equal 11
@@ -131,7 +131,7 @@
       _(pagy.next).must_equal 5
     end
     it 'initializes page 5' do
-      pagy = Pagy.new(**@vars, page: 5)
+      pagy = Pagy::Offset.new(**@vars, page: 5)
       _(pagy.count).must_equal 103
       _(pagy.last).must_equal 11
       _(pagy.last).must_equal 11
@@ -145,7 +145,7 @@
       _(pagy.next).must_equal 6
     end
     it 'initializes page 6' do
-      pagy = Pagy.new(**@vars, page: 6)
+      pagy = Pagy::Offset.new(**@vars, page: 6)
       _(pagy.count).must_equal 103
       _(pagy.last).must_equal 11
       _(pagy.last).must_equal 11
@@ -159,7 +159,7 @@
       _(pagy.next).must_equal 7
     end
     it 'initializes page 7' do
-      pagy = Pagy.new(**@vars, page: 7)
+      pagy = Pagy::Offset.new(**@vars, page: 7)
       _(pagy.count).must_equal 103
       _(pagy.last).must_equal 11
       _(pagy.last).must_equal 11
@@ -173,7 +173,7 @@
       _(pagy.next).must_equal 8
     end
     it 'initializes page 8' do
-      pagy = Pagy.new(**@vars, page: 8)
+      pagy = Pagy::Offset.new(**@vars, page: 8)
       _(pagy.count).must_equal 103
       _(pagy.last).must_equal 11
       _(pagy.last).must_equal 11
@@ -187,7 +187,7 @@
       _(pagy.next).must_equal 9
     end
     it 'initializes page 9' do
-      pagy = Pagy.new(**@vars, page: 9)
+      pagy = Pagy::Offset.new(**@vars, page: 9)
       _(pagy.count).must_equal 103
       _(pagy.last).must_equal 11
       _(pagy.last).must_equal 11
@@ -201,7 +201,7 @@
       _(pagy.next).must_equal 10
     end
     it 'initializes page 10' do
-      pagy = Pagy.new(**@vars, page: 10)
+      pagy = Pagy::Offset.new(**@vars, page: 10)
       _(pagy.count).must_equal 103
       _(pagy.last).must_equal 11
       _(pagy.last).must_equal 11
@@ -215,7 +215,7 @@
       _(pagy.next).must_equal 11
     end
     it 'initializes page 11' do
-      pagy = Pagy.new(**@vars, page: 11)
+      pagy = Pagy::Offset.new(**@vars, page: 11)
       _(pagy.count).must_equal 103
       _(pagy.last).must_equal 11
       _(pagy.last).must_equal 11
@@ -229,7 +229,7 @@
       _(pagy.next).must_be_nil
     end
     it 'initializes outset page 1' do
-      pagy = Pagy.new(count: 87, page: 1, outset: 10, limit: 10)
+      pagy = Pagy::Offset.new(count: 87, page: 1, outset: 10, limit: 10)
       _(pagy.offset).must_equal 10
       _(pagy.limit).must_equal 10
       _(pagy.in).must_equal 10
@@ -238,7 +238,7 @@
       _(pagy.last).must_equal 9
     end
     it 'initializes outset page 9' do
-      pagy = Pagy.new(count: 87, page: 9, outset: 10, limit: 10)
+      pagy = Pagy::Offset.new(count: 87, page: 9, outset: 10, limit: 10)
       _(pagy.offset).must_equal 90
       _(pagy.limit).must_equal 10
       _(pagy.in).must_equal 7
@@ -247,18 +247,18 @@
       _(pagy.last).must_equal 9
     end
     it 'handles the :cycle variable' do
-      pagy = Pagy.new(count: 100, page: 10, limit: 10, cycle: true)
+      pagy = Pagy::Offset.new(count: 100, page: 10, limit: 10, cycle: true)
       _(pagy.prev).must_equal 9
       _(pagy.next).must_equal 1
     end
     it 'handles the :ma_pages variable' do
-      pagy = Pagy.new(count: 100, page: 3, limit: 10, max_pages: 8)
+      pagy = Pagy::Offset.new(count: 100, page: 3, limit: 10, max_pages: 8)
       _(pagy.count).must_equal 100
       _(pagy.last).must_equal 8
-      _ { Pagy.new(count: 100, page: 9, limit: 10, max_pages: 8) }.must_raise Pagy::OverflowError
+      _ { Pagy::Offset.new(count: 100, page: 9, limit: 10, max_pages: 8) }.must_raise Pagy::OverflowError
     end
     it 'initializes the request_path' do
-      pagy = Pagy.new(count: 100, request_path: '/foo')
+      pagy = Pagy::Offset.new(count: 100, request_path: '/foo')
       _(pagy.vars[:request_path]).must_equal('/foo')
     end
   end
@@ -278,11 +278,11 @@
     it 'has vars defaults' do
       _(Pagy::DEFAULT[:page_sym]).must_equal :page
       _(Pagy::DEFAULT[:limit]).must_equal 20
-      _(Pagy::DEFAULT[:page]).must_equal 1
-      _(Pagy::DEFAULT[:outset]).must_equal 0
-      _(Pagy::DEFAULT[:size]).must_equal 7
-      _(Pagy::DEFAULT[:ends]).must_equal true
-      _(Pagy::DEFAULT[:count_args]).must_equal [:all]
+      _(Pagy::Offset::DEFAULT[:page]).must_equal 1
+      _(Pagy::Offset::DEFAULT[:outset]).must_equal 0
+      _(Pagy::Offset::DEFAULT[:size]).must_equal 7
+      _(Pagy::Offset::DEFAULT[:ends]).must_equal true
+      _(Pagy::Offset::DEFAULT[:count_args]).must_equal [:all]
     end
   end
 
@@ -302,7 +302,7 @@
     def series_for(page, *expected)
       expected.each_with_index do |value, index|
         vars = instance_variable_get(:"@vars#{index}").merge(page: page)
-        _(Pagy.new(**vars).series).must_equal value
+        _(Pagy::Offset.new(**vars).series).must_equal value
       end
     end
 
@@ -373,32 +373,32 @@ def series_for(page, *expected)
                  [1, :gap, 5, 6, 7, 8, 9, 10, "11"]
     end
     it 'computes series for count 0' do
-      _(Pagy.new(**@vars2, count: 0).series).must_equal ["1"]
+      _(Pagy::Offset.new(**@vars2, count: 0).series).must_equal ["1"]
     end
     it 'computes series for single page' do
-      _(Pagy.new(**@vars2, count: 8).series).must_equal ["1"]
+      _(Pagy::Offset.new(**@vars2, count: 8).series).must_equal ["1"]
     end
     it 'computes series for 1 of 2 pages' do
-      _(Pagy.new(**@vars2, count: 15).series).must_equal ["1", 2]
+      _(Pagy::Offset.new(**@vars2, count: 15).series).must_equal ["1", 2]
     end
     it 'computes series for 2 of 2 pages' do
-      _(Pagy.new(**@vars2, count: 15, page: 2).series).must_equal [1, "2"]
+      _(Pagy::Offset.new(**@vars2, count: 15, page: 2).series).must_equal [1, "2"]
     end
     it 'computes an empty series' do
-      _(Pagy.new(**@vars2, count: 100, size: 0).series).must_equal []
+      _(Pagy::Offset.new(**@vars2, count: 100, size: 0).series).must_equal []
     end
     it 'raises VariableError for invalid size' do
-      _ { Pagy.new(count: 100, size: {}).series }.must_raise Pagy::VariableError
-      _ { Pagy.new(count: 100, size: -3).series }.must_raise Pagy::VariableError
+      _ { Pagy::Offset.new(count: 100, size: {}).series }.must_raise Pagy::VariableError
+      _ { Pagy::Offset.new(count: 100, size: -3).series }.must_raise Pagy::VariableError
     end
   end
 
   describe 'labels' do
     it 'returns the current page label' do
-      _(Pagy.new(count: 1000, page: 11).label).must_equal '11'
+      _(Pagy::Offset.new(count: 1000, page: 11).label).must_equal '11'
     end
     it 'returns any page label' do
-      p = Pagy.new(count: 1000, page: 11)
+      p = Pagy::Offset.new(count: 1000, page: 11)
       _(p.label_for(3)).must_equal '3'
       _(p.label_for(11)).must_equal '11'
     end
diff --git a/test/pagy/url_helpers_test.rb b/test/pagy/url_helpers_test.rb
index 955d97c28..d3bcc69ce 100644
--- a/test/pagy/url_helpers_test.rb
+++ b/test/pagy/url_helpers_test.rb
@@ -8,27 +8,27 @@
 
   describe '#pagy_page_url' do
     it 'renders basic url' do
-      pagy = Pagy.new count: 1000, page: 3
+      pagy = Pagy::Offset.new count: 1000, page: 3
       _(app.pagy_page_url(pagy, 5)).must_equal '/foo?page=5'
       _(app.pagy_page_url(pagy, 5, absolute: true)).must_equal 'http://example.com:3000/foo?page=5'
     end
     it 'renders url with params' do
-      pagy = Pagy.new count: 1000, page: 3, params: { a: 3, b: 4 }
+      pagy = Pagy::Offset.new count: 1000, page: 3, params: { a: 3, b: 4 }
       _(app.pagy_page_url(pagy, 5)).must_equal "/foo?page=5&a=3&b=4"
       _(app.pagy_page_url(pagy, 5, absolute: true)).must_equal "http://example.com:3000/foo?page=5&a=3&b=4"
     end
     it 'renders url with fragment' do
-      pagy = Pagy.new count: 1000, page: 3
+      pagy = Pagy::Offset.new count: 1000, page: 3
       _(app.pagy_page_url(pagy, 6, fragment: '#fragment')).must_equal '/foo?page=6#fragment'
       _(app.pagy_page_url(pagy, 6, absolute: true, fragment: '#fragment')).must_equal 'http://example.com:3000/foo?page=6#fragment'
     end
     it 'renders url with params and fragment' do
-      pagy = Pagy.new count: 1000, page: 3, params: { a: 3, b: 4 }
+      pagy = Pagy::Offset.new count: 1000, page: 3, params: { a: 3, b: 4 }
       _(app.pagy_page_url(pagy, 5, fragment: '#fragment')).must_equal "/foo?page=5&a=3&b=4#fragment"
       _(app.pagy_page_url(pagy, 5, absolute: true, fragment: '#fragment')).must_equal "http://example.com:3000/foo?page=5&a=3&b=4#fragment"
     end
     it 'renders url with overridden path' do
-      pagy = Pagy.new count: 1000, page: 3, request_path: '/bar'
+      pagy = Pagy::Offset.new count: 1000, page: 3, request_path: '/bar'
       _(app.pagy_page_url(pagy, 5)).must_equal '/bar?page=5'
     end
   end
@@ -36,12 +36,12 @@
   describe '#pagy_set_query_params' do
     it 'overrides params' do
       app  = MockApp.new(params: { delete_me: 'delete_me', a: 5 })
-      pagy = Pagy.new(count: 1000,
-                      page: 3,
-                      params: lambda do |params|
-                        params.delete('delete_me')
-                        params.merge('b' => 4, 'add_me' => 'add_me')
-                      end)
+      pagy = Pagy::Offset.new(count: 1000,
+                              page: 3,
+                              params: lambda do |params|
+                                params.delete('delete_me')
+                                params.merge('b' => 4, 'add_me' => 'add_me')
+                              end)
       _(app.pagy_page_url(pagy, 5, fragment: '#fragment')).must_equal "/foo?a=5&page=5&b=4&add_me=add_me#fragment"
     end
   end