Extend Pages, close #7