Update paging to use options instead of constants