Add support for page indexing