Added comment capability