Updated to work with the new paginator