Added pagination support for the various modes.