Heavy refactoring - make Page as a new Content Type