Now supports the time type