Moving collection to use pageable rather than paginator