Updated comment functionality