Adding support for specifying comments in descriptors