Added some JavaDocs