Updated TimeSupport