JavaDoc comments updated