Added support for folder paging