Hooked CommentStorage and PageDecoratorImpl