diff --git a/storage/message/message.go b/storage/message/message.go
index e2becc0..2448a4a 100644
--- a/storage/message/message.go
+++ b/storage/message/message.go
@@ -10,11 +10,15 @@ type message struct {
 	tracking.Track
 }
 
+func Message(tr tracking.Track) *message {
+	return &message{tr}
+}
+
 func MakeMessage(t *tracking.TrackTemplate) tracking.Track {
 	if t.Head["domain"] == "" {
 		t.Head["domain"] = "scopes"
 	}
-	return &message{tracking.MakeTrack(t)}
+	return tracking.MakeTrack(t)
 }
 
 func (msg *message) Domain() string {
@@ -35,8 +39,7 @@ func Messages(db *sql.Storage) *tracking.Container {
 }
 
 func New(cont *tracking.Container, headValues lib.StrSlice, data lib.Map) *message {
-	tr := cont.NewTrack(headValues, data)
-	return tr.(*message)
+	return Message(cont.NewTrack(headValues, data))
 }
 
 // message store action handler
diff --git a/storage/tracking/tracking.go b/storage/tracking/tracking.go
index 23eaf78..5b51906 100644
--- a/storage/tracking/tracking.go
+++ b/storage/tracking/tracking.go
@@ -101,11 +101,6 @@ func Tracks(db *sql.Storage) *Container {
 	}
 }
 
-func New(cont *Container, headValues lib.StrSlice, data lib.Map) *track {
-	tr := cont.NewTrack(headValues, data)
-	return tr.(*track)
-}
-
 func (cont *Container) NewTrack(headValues lib.StrSlice, data lib.Map) Track {
 	head := lib.StrMap{}
 	for i, k := range cont.HeadFields {
diff --git a/tests/storage_test.go b/tests/storage_test.go
index 6d971b8..ffb2354 100644
--- a/tests/storage_test.go
+++ b/tests/storage_test.go
@@ -68,7 +68,7 @@ func BaseTest(t *testing.T, cfg *sql.Cfg, db *sql.Storage) {
 func TrackingTest(t *testing.T, cfg *sql.Cfg, db *sql.Storage) {
 	cont := tracking.Tracks(db)
 	cont.CreateTable()
-	track := tracking.New(cont, lib.StrSlice{"t01", "john"}, lib.Map{})
+	track := cont.NewTrack(lib.StrSlice{"t01", "john"}, lib.Map{})
 	t.AssertEqual(track.TrackId(), lib.Ident(1))
 	t.AssertEqual(track.TimeStamp().Year(), time.Now().Year())
 	//fmt.Printf("%+v\n", track.TimeStamp())
@@ -79,7 +79,6 @@ func MessageTest(t *testing.T, cfg *sql.Cfg, db *sql.Storage) {
 	//msgstore.StoreDB(db, msg)
 	cont := message.Messages(db)
 	cont.CreateTable()
-	//msg := cont.New(lib.StrSlice{"", "data"}, lib.Map{}).(*message.Message)
 	msg := message.New(cont, lib.StrSlice{"", "data"}, lib.Map{})
 	t.AssertEqual(msg.TrackId(), lib.Ident(1))
 	t.AssertEqual(msg.Domain(), "scopes")