Added unit counter pagination