Added some JavaDoc