Add support for multiple pages