Upstream has added supports for comments, it could be nice to replicate it here