Add comment support

Add comment support