diff --git a/storage/tracking/tracking.go b/storage/tracking/tracking.go
index d8049a2..9f3346b 100644
--- a/storage/tracking/tracking.go
+++ b/storage/tracking/tracking.go
@@ -251,11 +251,12 @@ func (cont *Container) NewTrack(h []string, data lib.Map) *track {
 	return tr
 }
 
-func (cont *Container) Save(tr *track) *track {
+func (cont *Container) Save(tr Track) Track {
 	return tr
 }
 
-func (cont *Container) Insert(tr *track) *track {
+func (cont *Container) Insert(trk Track) Track {
+	tr := trk.Base()
 	quSpec := &querySpec{
 		Scols: append(cont.HeadFields, "Data"),
 	}
@@ -274,12 +275,13 @@ func (cont *Container) Insert(tr *track) *track {
 		return err
 	}
 	if err := cont.Storage.Query(proc, sql, values...); err == nil {
-		return tr
+		return trk
 	}
 	return nil
 }
 
-func (cont *Container) Update(tr *track) *track {
+func (cont *Container) Update(trk Track) Track {
+	tr := trk.Base()
 	if tr.timeStamp == nil {
 		ts := time.Now()
 		tr.timeStamp = &ts
@@ -298,7 +300,7 @@ func (cont *Container) Update(tr *track) *track {
 	vals = append(vals, b)
 	n, _ := cont.Storage.Exec(sql, vals...)
 	if n == 1 {
-		return tr
+		return trk
 	}
 	return nil
 }