Add support for handling new pages, minor refactor