add time fields - contribution of @usbrandron