Improved kaminari support