Adding some more JavaDocs