Add JAVAdoc comments