More changes for Comment system