Updated comment model