Allow pagination on beta