better supoprt for the paginate and other features