TimeHelper changed to TimeModel throughout