Added JavaDoc comments