More work towards paginatable mixin