Enhanced doc-comments