Some javaDoc added