Improved handling of new pages