Updated comment annotations