Added some more JavaDocs support