Add functionality for both comments and class operations.