Add support for new pages