Extended to support Juvia comments.