Modify table class and manage comments.