diff --git a/cron/handler.go b/cron/handler.go
index 32388a4..fe91083 100644
--- a/cron/handler.go
+++ b/cron/handler.go
@@ -183,18 +183,18 @@ func (h *handler) getServers() ([]*models.Server, map[string]string, error) {
 		log.Infof("Loading servers from %s", version.Host)
 		resp, err := http.Get(fmt.Sprintf("https://%s%s", version.Host, endpointGetServers))
 		if err != nil {
-			log.Errorln(errors.Wrapf(err, "Cannot fetch servers from %s", version.Host))
+			log.Errorln(errors.Wrapf(err, "fetching servers from %s", version.Host))
 			continue
 		}
 		defer resp.Body.Close()
 		bodyBytes, err := ioutil.ReadAll(resp.Body)
 		if err != nil {
-			log.Errorln(errors.Wrapf(err, "Cannot read response body from %s", version.Host))
+			log.Errorln(errors.Wrapf(err, "reading response body from %s", version.Host))
 			continue
 		}
 		body, err := phpserialize.Decode(string(bodyBytes))
 		if err != nil {
-			log.Errorln(errors.Wrapf(err, "Cannot serialize body from %s into go value", version.Host))
+			log.Errorln(errors.Wrapf(err, "serializing body from %s into go value", version.Host))
 			continue
 		}
 		for serverKey, url := range body.(map[interface{}]interface{}) {
@@ -209,7 +209,7 @@ func (h *handler) getServers() ([]*models.Server, map[string]string, error) {
 				Version:     version,
 			}
 			if err := h.createSchema(server, false); err != nil {
-				log.WithField("serverKey", serverKey).Errorln(errors.Wrapf(err, "Cannot create schema for %s", serverKey))
+				log.WithField("serverKey", serverKey).Errorln(errors.Wrapf(err, "cannot create schema for %s", serverKey))
 				continue
 			}
 			serverKeys = append(serverKeys, serverKeyStr)
diff --git a/cron/update_server_data_worker.go b/cron/update_server_data_worker.go
index e422b92..a100f92 100644
--- a/cron/update_server_data_worker.go
+++ b/cron/update_server_data_worker.go
@@ -21,7 +21,7 @@ func (h *updateServerDataWorker) loadPlayers(od map[int]*models.OpponentsDefeate
 	ennoblements := []*models.Ennoblement{}
 	err := h.db.Model(&ennoblements).DistinctOn("new_owner_id").Order("new_owner_id ASC", "ennobled_at ASC").Select()
 	if err != nil {
-		return nil, errors.Wrap(err, "loadPlayers: Couldn't load ennoblements")
+		return nil, errors.Wrap(err, "loadPlayers: cannot load ennoblements")
 	}
 
 	players, err := h.dataloader.LoadPlayers()
@@ -72,7 +72,7 @@ func (h *updateServerDataWorker) loadEnnoblements() ([]*models.Ennoblement, erro
 		Limit(1).
 		Order("ennobled_at DESC").
 		Select(); err != nil && err != pg.ErrNoRows {
-		return nil, errors.Wrapf(err, "couldnt load last ennoblement")
+		return nil, errors.Wrapf(err, "cannot load last ennoblement")
 	}
 
 	return h.dataloader.LoadEnnoblements(&dataloader.LoadEnnoblementsConfig{
@@ -211,13 +211,13 @@ func (h *updateServerDataWorker) update() error {
 			Set("dominance = EXCLUDED.dominance").
 			Apply(appendODSetClauses).
 			Insert(); err != nil {
-			return errors.Wrap(err, "couldnt insert tribes")
+			return errors.Wrap(err, "cannot insert tribes")
 		}
 		if _, err := tx.Model(&tribes).
 			Where("NOT (tribe.id  = ANY (?))", pg.Array(ids)).
 			Set("exists = false").
 			Update(); err != nil && err != pg.ErrNoRows {
-			return errors.Wrap(err, "couldnt update nonexistent tribes")
+			return errors.Wrap(err, "cannot update nonexistent tribes")
 		}
 
 		tribesHistory := []*models.TribeHistory{}
@@ -227,7 +227,7 @@ func (h *updateServerDataWorker) update() error {
 			Where("tribe_id = ANY (?)", pg.Array(ids)).
 			Order("tribe_id DESC", "create_date DESC").
 			Select(); err != nil && err != pg.ErrNoRows {
-			return errors.Wrap(err, "couldnt select tribe history records")
+			return errors.Wrap(err, "cannot select tribe history records")
 		}
 		todaysTribeStats := h.calculateTodaysTribeStats(tribes, tribesHistory)
 		if len(todaysTribeStats) > 0 {
@@ -242,7 +242,7 @@ func (h *updateServerDataWorker) update() error {
 				Set("dominance = EXCLUDED.dominance").
 				Apply(appendODSetClauses).
 				Insert(); err != nil {
-				return errors.Wrap(err, "couldnt insert today's tribe stats")
+				return errors.Wrap(err, "cannot insert today's tribe stats")
 			}
 		}
 	}
@@ -262,14 +262,14 @@ func (h *updateServerDataWorker) update() error {
 			Set("daily_growth = EXCLUDED.daily_growth").
 			Apply(appendODSetClauses).
 			Insert(); err != nil {
-			return errors.Wrap(err, "couldnt insert players")
+			return errors.Wrap(err, "cannot insert players")
 		}
 		if _, err := tx.Model(&models.Player{}).
 			Where("NOT (player.id = ANY (?))", pg.Array(ids)).
 			Set("exists = false").
 			Set("tribe_id = 0").
 			Update(); err != nil && err != pg.ErrNoRows {
-			return errors.Wrap(err, "couldnt update nonexistent players")
+			return errors.Wrap(err, "cannot update nonexistent players")
 		}
 
 		playerHistory := []*models.PlayerHistory{}
@@ -278,7 +278,7 @@ func (h *updateServerDataWorker) update() error {
 			Column("*").
 			Where("player_id = ANY (?)", pg.Array(ids)).
 			Order("player_id DESC", "create_date DESC").Select(); err != nil && err != pg.ErrNoRows {
-			return errors.Wrap(err, "couldnt select player history records")
+			return errors.Wrap(err, "cannot select player history records")
 		}
 		todaysPlayerStats := h.calculateDailyPlayerStats(players, playerHistory)
 		if len(todaysPlayerStats) > 0 {
@@ -290,7 +290,7 @@ func (h *updateServerDataWorker) update() error {
 				Set("rank = EXCLUDED.rank").
 				Apply(appendODSetClauses).
 				Insert(); err != nil {
-				return errors.Wrap(err, "couldnt insert today's player stats")
+				return errors.Wrap(err, "cannot insert today's player stats")
 			}
 		}
 	}
@@ -299,7 +299,7 @@ func (h *updateServerDataWorker) update() error {
 		if _, err := tx.Model(&models.Village{}).
 			Where("true").
 			Delete(); err != nil && err != pg.ErrNoRows {
-			return errors.Wrap(err, "couldnt delete villages")
+			return errors.Wrap(err, "cannot delete villages")
 		}
 		if _, err := tx.Model(&villages).
 			OnConflict("(id) DO UPDATE").
@@ -310,12 +310,12 @@ func (h *updateServerDataWorker) update() error {
 			Set("bonus = EXCLUDED.bonus").
 			Set("player_id = EXCLUDED.player_id").
 			Insert(); err != nil {
-			return errors.Wrap(err, "couldnt insert villages")
+			return errors.Wrap(err, "cannot insert villages")
 		}
 	}
 	if len(ennoblements) > 0 {
 		if _, err := tx.Model(&ennoblements).Insert(); err != nil {
-			return errors.Wrap(err, "couldnt insert ennoblements")
+			return errors.Wrap(err, "cannot insert ennoblements")
 		}
 	}
 
@@ -330,7 +330,7 @@ func (h *updateServerDataWorker) update() error {
 		Returning("*").
 		WherePK().
 		Update(); err != nil {
-		return errors.Wrap(err, "couldnt update server")
+		return errors.Wrap(err, "cannot update server")
 	}
 
 	if err := tx.Commit(); err != nil {
diff --git a/cron/update_server_history_worker.go b/cron/update_server_history_worker.go
index d725cc7..77f5c67 100644
--- a/cron/update_server_history_worker.go
+++ b/cron/update_server_history_worker.go
@@ -17,7 +17,7 @@ type updateServerHistoryWorker struct {
 func (h *updateServerHistoryWorker) update() error {
 	players := []*models.Player{}
 	if err := h.db.Model(&players).Where("exists = true").Select(); err != nil {
-		return errors.Wrap(err, "couldnt load players")
+		return errors.Wrap(err, "cannot load players")
 	}
 
 	now := time.Now().In(h.location)
@@ -37,7 +37,7 @@ func (h *updateServerHistoryWorker) update() error {
 
 	tribes := []*models.Tribe{}
 	if err := h.db.Model(&tribes).Where("exists = true").Select(); err != nil {
-		return errors.Wrap(err, "couldnt load tribes")
+		return errors.Wrap(err, "cannot load tribes")
 	}
 	th := []*models.TribeHistory{}
 	for _, tribe := range tribes {
@@ -62,13 +62,13 @@ func (h *updateServerHistoryWorker) update() error {
 
 	if len(ph) > 0 {
 		if _, err := h.db.Model(&ph).Insert(); err != nil {
-			return errors.Wrap(err, "couldnt insert players history")
+			return errors.Wrap(err, "cannot insert players history")
 		}
 	}
 
 	if len(th) > 0 {
 		if _, err := h.db.Model(&th).Insert(); err != nil {
-			return errors.Wrap(err, "couldnt insert tribes history")
+			return errors.Wrap(err, "cannot insert tribes history")
 		}
 	}
 
@@ -77,7 +77,7 @@ func (h *updateServerHistoryWorker) update() error {
 		WherePK().
 		Returning("*").
 		Update(); err != nil {
-		return errors.Wrap(err, "couldnt update server")
+		return errors.Wrap(err, "cannot update server")
 
 	}
 
diff --git a/cron/update_server_stats_worker.go b/cron/update_server_stats_worker.go
index eea51cf..59543b0 100644
--- a/cron/update_server_stats_worker.go
+++ b/cron/update_server_stats_worker.go
@@ -17,39 +17,39 @@ type updateServerStatsWorker struct {
 func (h *updateServerStatsWorker) prepare() (*models.ServerStats, error) {
 	activePlayers, err := h.db.Model(&models.Player{}).Where("exists = true").Count()
 	if err != nil {
-		return nil, errors.Wrap(err, "couldnt count active players")
+		return nil, errors.Wrap(err, "cannot count active players")
 	}
 	inactivePlayers, err := h.db.Model(&models.Player{}).Where("exists = false").Count()
 	if err != nil {
-		return nil, errors.Wrap(err, "couldnt count inactive players")
+		return nil, errors.Wrap(err, "cannot count inactive players")
 	}
 	players := activePlayers + inactivePlayers
 
 	activeTribes, err := h.db.Model(&models.Tribe{}).Where("exists = true").Count()
 	if err != nil {
-		return nil, errors.Wrap(err, "couldnt count active tribes")
+		return nil, errors.Wrap(err, "cannot count active tribes")
 	}
 	inactiveTribes, err := h.db.Model(&models.Tribe{}).Where("exists = false").Count()
 	if err != nil {
-		return nil, errors.Wrap(err, "couldnt count inactive tribes")
+		return nil, errors.Wrap(err, "cannot count inactive tribes")
 	}
 	tribes := activeTribes + inactiveTribes
 
 	barbarianVillages, err := h.db.Model(&models.Village{}).Where("player_id = 0").Count()
 	if err != nil {
-		return nil, errors.Wrap(err, "couldnt count barbarian villages")
+		return nil, errors.Wrap(err, "cannot count barbarian villages")
 	}
 	bonusVillages, err := h.db.Model(&models.Village{}).Where("bonus <> 0").Count()
 	if err != nil {
-		return nil, errors.Wrap(err, "couldnt count bonus villages")
+		return nil, errors.Wrap(err, "cannot count bonus villages")
 	}
 	playerVillages, err := h.db.Model(&models.Village{}).Where("player_id <> 0").Count()
 	if err != nil {
-		return nil, errors.Wrap(err, "couldnt count player villages")
+		return nil, errors.Wrap(err, "cannot count player villages")
 	}
 	villages, err := h.db.Model(&models.Village{}).Count()
 	if err != nil {
-		return nil, errors.Wrap(err, "couldnt count villages")
+		return nil, errors.Wrap(err, "cannot count villages")
 	}
 
 	now := time.Now().In(h.location)
@@ -84,7 +84,7 @@ func (h *updateServerStatsWorker) update() error {
 	defer tx.Close()
 
 	if _, err := tx.Model(stats).Insert(); err != nil {
-		return errors.Wrap(err, "couldnt insert server stats")
+		return errors.Wrap(err, "cannot insert server stats")
 	}
 
 	_, err = tx.Model(h.server).
@@ -93,7 +93,7 @@ func (h *updateServerStatsWorker) update() error {
 		Returning("*").
 		Update()
 	if err != nil {
-		return errors.Wrap(err, "couldnt update server")
+		return errors.Wrap(err, "cannot update server")
 	}
 
 	return tx.Commit()
diff --git a/cron/vacuum_server_db_worker.go b/cron/vacuum_server_db_worker.go
index fbb8986..472f6b3 100644
--- a/cron/vacuum_server_db_worker.go
+++ b/cron/vacuum_server_db_worker.go
@@ -31,7 +31,7 @@ func (h *vacuumServerDBWorker) vacuum() error {
 		Where("player_id IN (Select id FROM players) OR player_history.create_date < ?", time.Now().Add(-1*day*180)).
 		Delete()
 	if err != nil {
-		return errors.Wrap(err, "couldnt delete old player history records")
+		return errors.Wrap(err, "cannot delete old player history records")
 	}
 
 	_, err = tx.Model(&models.TribeHistory{}).
@@ -39,7 +39,7 @@ func (h *vacuumServerDBWorker) vacuum() error {
 		Where("tribe_id IN (Select id FROM tribes) OR tribe_history.create_date < ?", time.Now().Add(-1*day*180)).
 		Delete()
 	if err != nil {
-		return errors.Wrap(err, "couldnt delete old tribe history records")
+		return errors.Wrap(err, "cannot delete old tribe history records")
 	}
 
 	_, err = tx.Model(&models.DailyPlayerStats{}).
@@ -47,7 +47,7 @@ func (h *vacuumServerDBWorker) vacuum() error {
 		Where("player_id IN (Select id FROM players) OR daily_player_stats.create_date < ?", time.Now().Add(-1*day*180)).
 		Delete()
 	if err != nil {
-		return errors.Wrap(err, "couldnt delete old player stats records")
+		return errors.Wrap(err, "cannot delete old player stats records")
 	}
 
 	_, err = tx.Model(&models.DailyTribeStats{}).
@@ -55,7 +55,7 @@ func (h *vacuumServerDBWorker) vacuum() error {
 		Where("tribe_id IN (Select id FROM tribes) OR daily_tribe_stats.create_date < ?", time.Now().Add(-1*day*180)).
 		Delete()
 	if err != nil {
-		return errors.Wrap(err, "couldnt delete old tribe stats records")
+		return errors.Wrap(err, "cannot delete old tribe stats records")
 	}
 
 	return tx.Commit()
diff --git a/go.mod b/go.mod
index 0c4d1de..d5d4c8b 100644
--- a/go.mod
+++ b/go.mod
@@ -10,5 +10,5 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/sirupsen/logrus v1.7.0
-	github.com/tribalwarshelp/shared v0.0.0-20210109140746-d8366b738e68
+	github.com/tribalwarshelp/shared v0.0.0-20210113192528-c747617519f2
 )
diff --git a/go.sum b/go.sum
index 7219eb0..bbbe2fd 100644
--- a/go.sum
+++ b/go.sum
@@ -88,8 +88,8 @@ github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc h1:9lRDQMhESg+zvGYmW5DyG0UqvY96Bu5QYsTLvCHdrgo=
 github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc/go.mod h1:bciPuU6GHm1iF1pBvUfxfsH0Wmnc2VbpgvbI9ZWuIRs=
-github.com/tribalwarshelp/shared v0.0.0-20210109140746-d8366b738e68 h1:Pvf1O1UcbknnMT9deLCQu42QQFV3OZjsKtY4i86Tdjc=
-github.com/tribalwarshelp/shared v0.0.0-20210109140746-d8366b738e68/go.mod h1:vtDs7EjEysk4dpFPfu3c4lkICXZYIRV0BrT7rsqG0dw=
+github.com/tribalwarshelp/shared v0.0.0-20210113192528-c747617519f2 h1:qBJGQiXhhKox/E4Bt+8uYhsOic9QcBLNMYO7LekCudg=
+github.com/tribalwarshelp/shared v0.0.0-20210113192528-c747617519f2/go.mod h1:vtDs7EjEysk4dpFPfu3c4lkICXZYIRV0BrT7rsqG0dw=
 github.com/vmihailenco/bufpool v0.1.11 h1:gOq2WmBrq0i2yW5QJ16ykccQ4wH9UyEsgLm6czKAd94=
 github.com/vmihailenco/bufpool v0.1.11/go.mod h1:AFf/MOy3l2CFTKbxwt0mp2MwnqjNEs5H/UxrkA5jxTQ=
 github.com/vmihailenco/msgpack/v4 v4.3.11 h1:Q47CePddpNGNhk4GCnAx9DDtASi2rasatE0cd26cZoE=