diff --git a/cmd/root.go b/cmd/root.go
index f47984d..b0de3f7 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -19,6 +19,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/aws/aws-lambda-go/events"
 	"github.com/aws/aws-lambda-go/lambda"
@@ -196,16 +197,6 @@ func configLambda() {
 	svc := secretsmanager.New(s)
 	secrets := config.NewSecrets(svc)
 
-        unwrap = os.Getenv("LOG_LEVEL")
-        if len([]rune(unwrap)) != 0 {
-           cfg.LogLevel = unwrap
-        }
-
-        unwrap = os.Getenv("LOG_FORMAT")
-        if len([]rune(unwrap)) != 0 {
-           cfg.LogFormat = unwrap
-        }
-
 	unwrap, err := secrets.GoogleAdminEmail(os.Getenv("GOOGLE_ADMIN"))
 	if err != nil {
 		log.Fatalf(errors.Wrap(err, "cannot read config").Error())
@@ -242,14 +233,14 @@ func configLambda() {
 	}
 	cfg.IdentityStoreID = unwrap
 
-	unwrap = os.Getenv("USER_MATCH")
+        unwrap = os.Getenv("LOG_LEVEL")
         if len([]rune(unwrap)) != 0 {
-	   cfg.user-match = unwrap
+           cfg.LogLevel = unwrap
         }
 
-        unwrap = os.Getenv("GROUP_MATCH")
+        unwrap = os.Getenv("LOG_FORMAT")
         if len([]rune(unwrap)) != 0 {
-           cfg.group-match = unwrap
+           cfg.LogFormat = unwrap
         }
 
 	unwrap = os.Getenv("SYNC_METHOD")
@@ -257,19 +248,29 @@ func configLambda() {
            cfg.SyncMethod = unwrap
         }
 
+	unwrap = os.Getenv("USER_MATCH")
+        if len([]rune(unwrap)) != 0 {
+	   cfg.UserMatch = unwrap
+        }
+
+	unwrap = os.Getenv("GROUP_MATCH")
+        if len([]rune(unwrap)) != 0 {
+           cfg.GroupMatch = unwrap
+        }
+
         unwrap = os.Getenv("IGNORE_GROUPS")
         if len([]rune(unwrap)) != 0 {
-           cfg.ignore-groups = unwrap
+           cfg.IgnoreGroups = strings.Split(unwrap, ",")
         }
 
         unwrap = os.Getenv("IGNORE_USERS")
         if len([]rune(unwrap)) != 0 {
-           cfg.ignore-users = unwrap
+           cfg.IgnoreUsers = strings.Split(unwrap, ",")
         }
 
         unwrap = os.Getenv("INCLUDE_GROUPS")
         if len([]rune(unwrap)) != 0 {
-           cfg.include-groups = unwrap
+           cfg.IncludeGroups = strings.Split(unwrap, ",")
         }
 
 }