Added Time and TimeFormat types