Add support for 2i pagination