Removed dependency on paging info