add extended pagination support