Modified and updated JavaDoc