diff --git a/db.go b/db.go
index 37b554b..24c8f92 100644
--- a/db.go
+++ b/db.go
@@ -406,7 +406,7 @@ func addNewDatabaseCardEntry(cardName, cardNumber, cardHolder, cardIssuer, cardC
 	var err error
 	var db *gorm.DB
 
-	fields := MapString([]string{cardName, cardHolder, cardNumber, cardCvv,
+	fields := Map([]string{cardName, cardHolder, cardNumber, cardCvv,
 		cardPin, cardIssuer, cardClass, cardExpiry, tags, notes},
 		strings.TrimSpace)
 
diff --git a/utils.go b/utils.go
index 4289065..f482199 100644
--- a/utils.go
+++ b/utils.go
@@ -53,13 +53,12 @@ type Settings struct {
 // Global settings override
 var settingsRider SettingsOverride
 
-// Map a function to an array of strings
-func MapString(vs []string, f func(string) string) []string {
-	vsm := make([]string, len(vs))
-	for i, v := range vs {
-		vsm[i] = f(v)
+func Map[T any](input []T, f func(T) T) []T {
+	output := make([]T, len(input))
+	for i, v := range input {
+		output[i] = f(v)
 	}
-	return vsm
+	return output
 }
 
 // Print a secret