Adding support for zm comments.