JavaDoc comments added