Added JDoc comments