Update base class and comments.