hasFunc has been modified and timeFunc and rangeFunc has been adeed.