Now supports time type