Refactoring and extension of page specs