Compatibility with multiple page types #8