Add classes and comments