Updated pager
Merge branch 'feature/support-paging-function' into develop