Use COMMENT_PROPERTIES here