Implementation of paginator has been changed