Add paging and more metrics