modify to introduce time type