Switched to interface based page types