Adding NTP support