Added some "pagination" to the extension.