Maintenance for comments