Added to comment management