Adding some JavaDoc