added Time type support