Adding more doc-comments