diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8677228b..1b3b7177 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 0.90.44 (05-25-2020)
+- Modified Makefile to include "netgo" tag during golang build
+
 # 0.90.43 (05-21-2020)
 - Fixed service TLS checkbox form for edit and create
 - Modified ICMP ping's to use system's "ping" command (doesn't need root access)
diff --git a/Makefile b/Makefile
index d9f3c8be..35debf81 100644
--- a/Makefile
+++ b/Makefile
@@ -162,13 +162,13 @@ build-win:
 		go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-windows-386/statping.exe ./cmd
 
 build-darwin:
-	GO111MODULE="on" GOOS=darwin GOARCH=amd64 go build -a -ldflags "-s -w -X main.VERSION=${VERSION}" -o releases/statping-darwin-amd64/statping --tags "darwin" ./cmd
+	GO111MODULE="on" GOOS=darwin GOARCH=amd64 go build -a -ldflags "-s -w -X main.VERSION=${VERSION}" -o releases/statping-darwin-amd64/statping --tags "netgo darwin" ./cmd
 
 build-linux:
 	CGO_ENABLED=1 GO111MODULE="on" GOOS=linux GOARCH=amd64 \
-		go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-linux-amd64/statping --tags "linux" ./cmd
+		go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-linux-amd64/statping --tags "netgo linux" ./cmd
 	CGO_ENABLED=1 GO111MODULE="on" GOOS=linux GOARCH=386 \
-		go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-linux-386/statping --tags "linux" ./cmd
+		go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-linux-386/statping --tags "netgo linux" ./cmd
 
 build-linux-arm:
 	CGO_ENABLED=1 CC=arm-linux-gnueabihf-gcc-6 CXX=arm-linux-gnueabihf-g++-6 GO111MODULE="on" GOOS=linux GOARCH=arm GOARM=7 \
diff --git a/cmd/main.go b/cmd/main.go
index 14f98f0a..bffac4d6 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -114,8 +114,9 @@ func start() {
 		}
 
 		if utils.Params.GetBool("SAMPLE_DATA") {
+			log.Infoln("Adding Sample Data")
 			if err := configs.TriggerSamples(); err != nil {
-				exit(errors.Wrap(err, "error creating database"))
+				exit(errors.Wrap(err, "error adding sample data"))
 			}
 		} else {
 			if err := core.Samples(); err != nil {
diff --git a/types/checkins/samples.go b/types/checkins/samples.go
index 19a933cc..f7b48f37 100644
--- a/types/checkins/samples.go
+++ b/types/checkins/samples.go
@@ -6,6 +6,7 @@ import (
 )
 
 func Samples() error {
+	log.Infoln("Inserting Sample Checkins...")
 	checkin1 := &Checkin{
 		Name:        "Demo Checkin 1",
 		ServiceId:   1,
@@ -31,6 +32,7 @@ func Samples() error {
 }
 
 func SamplesChkHits() error {
+	log.Infoln("Inserting Sample Checkins Hits...")
 	checkTime := utils.Now().Add(-3 * time.Minute)
 
 	for i := int64(1); i <= 2; i++ {
diff --git a/types/configs/database.go b/types/configs/database.go
index 60d81eaf..f400875c 100644
--- a/types/configs/database.go
+++ b/types/configs/database.go
@@ -28,9 +28,8 @@ type Sampler interface {
 func TriggerSamples() error {
 	return createSamples(
 		core.Samples,
-		//users.Samples,
-		messages.Samples,
 		services.Samples,
+		messages.Samples,
 		checkins.Samples,
 		checkins.SamplesChkHits,
 		failures.Samples,
diff --git a/types/failures/samples.go b/types/failures/samples.go
index 1fb333b9..d84f4b24 100644
--- a/types/failures/samples.go
+++ b/types/failures/samples.go
@@ -9,10 +9,11 @@ import (
 )
 
 var (
-	log = utils.Log
+	log = utils.Log.WithField("type", "failure")
 )
 
 func Samples() error {
+	log.Infoln("Inserting Sample Service Failures...")
 	createdAt := utils.Now().Add(-3 * types.Day)
 
 	for i := int64(1); i <= 4; i++ {
diff --git a/types/groups/database.go b/types/groups/database.go
index 8b9aa4c8..15f143e5 100644
--- a/types/groups/database.go
+++ b/types/groups/database.go
@@ -3,10 +3,14 @@ package groups
 import (
 	"github.com/statping/statping/database"
 	"github.com/statping/statping/types/errors"
+	"github.com/statping/statping/utils"
 	"sort"
 )
 
-var db database.Database
+var (
+	db  database.Database
+	log = utils.Log.WithField("type", "group")
+)
 
 func SetDB(database database.Database) {
 	db = database.Model(&Group{})
diff --git a/types/groups/samples.go b/types/groups/samples.go
index ee9ec666..257913a6 100644
--- a/types/groups/samples.go
+++ b/types/groups/samples.go
@@ -5,6 +5,7 @@ import (
 )
 
 func Samples() error {
+	log.Infoln("Inserting Sample Groups...")
 	group1 := &Group{
 		Name:   "Main Services",
 		Public: null.NewNullBool(true),
diff --git a/types/hits/samples.go b/types/hits/samples.go
index d432886d..2bbb4a97 100644
--- a/types/hits/samples.go
+++ b/types/hits/samples.go
@@ -14,6 +14,7 @@ import (
 var SampleHits = 99900.
 
 func Samples() error {
+	log.Infoln("Inserting Sample Service Hits...")
 	for i := int64(1); i <= 5; i++ {
 		records := createHitsAt(i)
 		if err := gormbulk.BulkInsert(db.GormDB(), records, db.ChunkSize()); err != nil {
diff --git a/types/incidents/database.go b/types/incidents/database.go
index b04d489f..16d2e69a 100644
--- a/types/incidents/database.go
+++ b/types/incidents/database.go
@@ -1,10 +1,14 @@
 package incidents
 
-import "github.com/statping/statping/database"
+import (
+	"github.com/statping/statping/database"
+	"github.com/statping/statping/utils"
+)
 
 var (
 	db       database.Database
 	dbUpdate database.Database
+	log      = utils.Log.WithField("type", "service")
 )
 
 func SetDB(database database.Database) {
diff --git a/types/incidents/samples.go b/types/incidents/samples.go
index 2fb66545..7096eae7 100644
--- a/types/incidents/samples.go
+++ b/types/incidents/samples.go
@@ -6,6 +6,7 @@ import (
 )
 
 func Samples() error {
+	log.Infoln("Inserting Sample Incidents...")
 	incident1 := &Incident{
 		Title:       "Github Issues",
 		Description: "There are new features for Statping, if you have any issues please visit the Github Repo.",
diff --git a/types/messages/database.go b/types/messages/database.go
index 7b4be440..4abf14bd 100644
--- a/types/messages/database.go
+++ b/types/messages/database.go
@@ -3,9 +3,13 @@ package messages
 import (
 	"github.com/statping/statping/database"
 	"github.com/statping/statping/types/errors"
+	"github.com/statping/statping/utils"
 )
 
-var db database.Database
+var (
+	db  database.Database
+	log = utils.Log.WithField("type", "message")
+)
 
 func SetDB(database database.Database) {
 	db = database.Model(&Message{})
diff --git a/types/messages/samples.go b/types/messages/samples.go
index d7fc2032..7669c3ea 100644
--- a/types/messages/samples.go
+++ b/types/messages/samples.go
@@ -5,6 +5,7 @@ import (
 )
 
 func Samples() error {
+	log.Infoln("Inserting Sample Messages...")
 	m1 := &Message{
 		Title:       "Routine Downtime",
 		Description: "This is an example a upcoming message for a service!",
diff --git a/types/services/samples.go b/types/services/samples.go
index 7d82ab9f..011ccfcb 100644
--- a/types/services/samples.go
+++ b/types/services/samples.go
@@ -7,6 +7,7 @@ import (
 )
 
 func Samples() error {
+	log.Infoln("Inserting Sample Services...")
 	createdOn := utils.Now().Add(((-24 * 30) * 3) * time.Hour)
 	s1 := &Service{
 		Name:           "Google",
diff --git a/types/users/sample.go b/types/users/sample.go
index a99c2523..ecaa3409 100644
--- a/types/users/sample.go
+++ b/types/users/sample.go
@@ -5,6 +5,7 @@ import (
 )
 
 func Samples() error {
+	log.Infoln("Inserting Sample Users...")
 	u2 := &User{
 		Username: "testadmin",
 		Password: "password123",
diff --git a/utils/configs.go b/utils/configs.go
index c63ee3cd..7abd3e46 100644
--- a/utils/configs.go
+++ b/utils/configs.go
@@ -7,15 +7,16 @@ import (
 )
 
 var (
-	Params *viper.Viper
+	Params    *viper.Viper
+	configLog = Log.WithField("type", "configs")
 )
 
 func InitCLI() {
 	Params = viper.New()
 	Params.AutomaticEnv()
+	setDefaults()
 	Directory = Params.GetString("STATPING_DIR")
 	//Params.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
-	setDefaults()
 	Params.SetConfigName("config")
 	Params.SetConfigType("yml")
 	Params.AddConfigPath(Directory)
@@ -30,16 +31,12 @@ func InitCLI() {
 }
 
 func setDefaults() {
-	if Directory == "" {
-		defaultDir, err := os.Getwd()
-		if err != nil {
-			defaultDir = "."
-		}
-		Params.SetDefault("STATPING_DIR", defaultDir)
-		Directory = defaultDir
+	defaultDir, err := os.Getwd()
+	if err != nil {
+		configLog.Errorln(err)
+		defaultDir = "."
 	}
-	Directory = Params.GetString("STATPING_DIR")
-	Params.SetDefault("STATPING_DIR", Directory)
+	Params.SetDefault("STATPING_DIR", defaultDir)
 	Params.SetDefault("GO_ENV", "")
 	Params.SetDefault("DB_CONN", "")
 	Params.SetDefault("DISABLE_LOGS", false)
diff --git a/version.txt b/version.txt
index c51f8fca..b53e3ec9 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.90.43
+0.90.44