Upgraded JavaDoc