Added comment features.