Some JavaDoc added