Refactorting of the PageDictionary