Improvements on paginator