Comment support improved