Added more JavaDocs