Paginator enhancements