Added unmarshal of time.Time