redesign models (comments, labels)