Add auto-comments