Improve comment support