Update the way to return paginate data for better reliability