Added support for paged view data