Adding comment support