Updated JavaDoc comments