Make paging optional (requested by FL)