Major refactoring for content protection.