More JavaDoc added