Updated comment fields