Add comment support