Updated paginator mixin