Several changes to support pagination features for lists