PaginatorFactory updated