diff --git a/cli/atlas/README.md b/cli/atlas/README.md
index 4da81220..ea4f3943 100644
--- a/cli/atlas/README.md
+++ b/cli/atlas/README.md
@@ -32,7 +32,7 @@ You're all set! Alternatively, you can clone the repository and install the bina
 
 ```sh
 $ git clone https://github.com/infobloxopen/atlas-app-toolkit.git
-$ cd ngp.api.toolkit/cli/atlas
+$ cd atlas-app-toolkit/cli/atlas
 $ go install
 ```
 
diff --git a/cli/atlas/formatting.go b/cli/atlas/formatting.go
index d675d4a3..b5a88f46 100644
--- a/cli/atlas/formatting.go
+++ b/cli/atlas/formatting.go
@@ -9,7 +9,8 @@ import (
 var (
 	errEmptyServiceName   = formatError{"empty service name"}
 	errInvalidFirstRune   = formatError{"leading non-letter in service name"}
-	errInvalidProjectRoot = formatError{"project must be initialized inside $GOPATH/src directory"}
+	errInvalidProjectRoot = formatError{"project must be initialized inside $GOPATH/src directory or below"}
+	errMissingGOPATH      = formatError{"$GOPATH environment variable not set"}
 )
 
 // ServiceName takes a string and formats it into a valid gRPC service name
@@ -40,17 +41,23 @@ func ServerURL(str string) (string, error) {
 }
 
 // ProjectRoot determines the root directory of an application. The project
-// root is considered to be anything after go/src/...
-func ProjectRoot(dirString string) (string, error) {
-	dirs := strings.Split(dirString, "/")
-	for i, dir := range dirs {
-		if strings.ToLower(dir) == "go" && i+1 < len(dirs) {
-			if i+2 < len(dirs) && strings.ToLower(dirs[i+1]) == "src" {
-				return strings.Join(dirs[i+2:], "/"), nil
-			}
-		}
+// root is considered to be anything in $GOPATH/src or below
+func ProjectRoot(gopath, workdir string) (string, error) {
+	if gopath == "" {
+		return "", errMissingGOPATH
 	}
-	return "", errInvalidProjectRoot
+	if len(workdir) < len(gopath) {
+		return "", errInvalidProjectRoot
+	}
+	if workdir[:len(gopath)] != gopath {
+		return "", errInvalidProjectRoot
+	}
+	projectpath := workdir[len(gopath):]
+	dirs := strings.Split(projectpath, "/")
+	if len(dirs) < 2 {
+		return "", errInvalidProjectRoot
+	}
+	return strings.Join(dirs[2:], "/"), nil
 }
 
 // isSpecial checks if rune is non-alphanumeric
diff --git a/cli/atlas/formatting_test.go b/cli/atlas/formatting_test.go
index 486e33dc..74cb3a2d 100644
--- a/cli/atlas/formatting_test.go
+++ b/cli/atlas/formatting_test.go
@@ -57,38 +57,68 @@ func TestServerURL(t *testing.T) {
 
 func TestProjectRoot(t *testing.T) {
 	var tests = []struct {
-		path     string
+		gopath   string
+		workdir  string
 		expected string
 		err      error
 	}{
 		{
-			"go/src/ProjectRoot",
-			"ProjectRoot",
-			nil,
+			gopath:   "/Users/person/go",
+			workdir:  "/Users/person/go/src",
+			expected: "",
+			err:      nil,
 		},
 		{
-			"go/src/github.com/secret_project",
-			"github.com/secret_project",
-			nil,
+			gopath:   "/Users/person/go",
+			workdir:  "/Users/person/go/src/SomeProject",
+			expected: "SomeProject",
+			err:      nil,
 		},
 		{
-			"/Users/john/go/src/github.com/infobloxopen/helloWorld",
-			"github.com/infobloxopen/helloWorld",
-			nil,
+			gopath:   "/Users/person/go_projects",
+			workdir:  "/Users/person/go_projects/src/SomeProject",
+			expected: "SomeProject",
+			err:      nil,
 		},
 		{
-			"/Users/john/go",
-			"",
-			errInvalidProjectRoot,
+			gopath:   "go",
+			workdir:  "go/src/github.com/SomeProject",
+			expected: "github.com/SomeProject",
+			err:      nil,
 		},
 		{
-			"go/src",
-			"",
-			errInvalidProjectRoot,
+			gopath:   "/Users/person/go",
+			workdir:  "/Users/person/go/src/github.com/infobloxopen/SomeProject",
+			expected: "github.com/infobloxopen/SomeProject",
+			err:      nil,
+		},
+		{
+			gopath:   "/Users/person/go",
+			workdir:  "/Users/python",
+			expected: "",
+			err:      errInvalidProjectRoot,
+		},
+		{
+			gopath:   "/Users/person/go",
+			workdir:  "/Users/person/hi/src/SomeProject",
+			expected: "",
+			err:      errInvalidProjectRoot,
+		},
+		{
+			gopath:   "/Users/person/go",
+			workdir:  "/Users/person/go",
+			expected: "",
+			err:      errInvalidProjectRoot,
+		},
+		{
+			gopath:   "",
+			workdir:  "/Users/person/go/src/SomeProject",
+			expected: "",
+			err:      errMissingGOPATH,
 		},
 	}
 	for _, test := range tests {
-		root, err := ProjectRoot(test.path)
+		root, err := ProjectRoot(test.gopath, test.workdir)
 		if root != test.expected {
 			t.Errorf("Unexpected service name: %s - expected %s", root, test.expected)
 		}
diff --git a/cli/atlas/main.go b/cli/atlas/main.go
index 7606b319..624f3b9e 100644
--- a/cli/atlas/main.go
+++ b/cli/atlas/main.go
@@ -19,6 +19,7 @@ const (
 	FLAG_NAME     = "name"
 	FLAG_REGISTRY = "registry"
 	FLAG_GATEWAY  = "gateway"
+	FLAG_DEBUG    = "debug"
 )
 
 var (
@@ -27,6 +28,7 @@ var (
 	initializeName     = initialize.String(FLAG_NAME, "", "the application name (required)")
 	initializeRegistry = initialize.String(FLAG_REGISTRY, "", "the Docker registry (optional)")
 	initializeGateway  = initialize.Bool(FLAG_GATEWAY, false, "generate project with a gRPC gateway (default false)")
+	initializeDebug    = initialize.Bool(FLAG_DEBUG, false, "print debug statements during intialization (default false)")
 )
 
 func main() {
@@ -154,7 +156,7 @@ func initializeApplication() {
 	if err != nil {
 		printErr(err)
 	}
-	root, err := ProjectRoot(wd)
+	root, err := ProjectRoot(os.Getenv("GOPATH"), wd)
 	if err != nil {
 		printErr(err)
 	}
@@ -188,10 +190,10 @@ func initializeApplication() {
 	if err := generateProtobuf(); err != nil {
 		printErr(err)
 	}
-	if err := resolveImports(app.directories()); err != nil {
+	if err := initDep(); err != nil {
 		printErr(err)
 	}
-	if err := initDep(); err != nil {
+	if err := resolveImports(app.directories()); err != nil {
 		printErr(err)
 	}
 }
@@ -204,8 +206,7 @@ func printErr(err error) {
 // initDep calls "dep init" to generate .toml files
 func initDep() error {
 	fmt.Print("Starting dep project... ")
-	err := exec.Command("dep", "init").Run()
-	if err != nil {
+	if err := runCommand("dep", "init"); err != nil {
 		return err
 	}
 	fmt.Println("done!")
@@ -215,8 +216,7 @@ func initDep() error {
 // generateProtobuf calls "make protobuf" to render initial .pb files
 func generateProtobuf() error {
 	fmt.Print("Generating protobuf files... ")
-	err := exec.Command("make", "protobuf").Run()
-	if err != nil {
+	if err := runCommand("make", "protobuf"); err != nil {
 		return err
 	}
 	fmt.Println("done!")
@@ -227,11 +227,22 @@ func generateProtobuf() error {
 func resolveImports(dirs []string) error {
 	fmt.Print("Resolving imports... ")
 	for _, dir := range dirs {
-		err := exec.Command("goimports", "-w", dir).Run()
-		if err != nil {
+		if err := runCommand("goimports", "-w", dir); err != nil {
 			return err
 		}
 	}
 	fmt.Println("done!")
 	return nil
 }
+
+func runCommand(command string, args ...string) error {
+	cmd := exec.Command(command, args...)
+	if *initializeDebug {
+		cmd.Stderr = os.Stdout
+		cmd.Stdout = os.Stderr
+	}
+	if err := cmd.Run(); err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/cli/atlas/template-bindata.go b/cli/atlas/template-bindata.go
index 47315efb..86ba6018 100644
--- a/cli/atlas/template-bindata.go
+++ b/cli/atlas/template-bindata.go
@@ -94,12 +94,12 @@ func templatesGitignoreGotmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "templates/.gitignore.gotmpl", size: 4, mode: os.FileMode(420), modTime: time.Unix(1522341651, 0)}
+	info := bindataFileInfo{name: "templates/.gitignore.gotmpl", size: 4, mode: os.FileMode(420), modTime: time.Unix(1523468144, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
 
-var _templatesMakefileGotmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x56\x51\x8f\x9b\x38\x10\x7e\xc6\xbf\x62\x14\x45\x6a\xdc\x3b\x83\xee\xed\xc4\x29\x6a\x69\x96\x66\xb9\xee\xc2\x8a\xb0\xad\x56\xaa\x84\x58\x30\x2c\x2a\xc1\x1c\x98\x6c\x57\xbb\xf9\xef\x27\x83\x1d\x20\xd9\xf4\x54\x55\x97\x87\x80\xed\xf1\x37\x9f\xbf\xf1\xcc\x70\xe3\x7b\x7f\xdb\xab\x20\xf4\x3d\x2f\x00\x4d\xd3\x34\x73\x09\xcf\xcf\xa0\xfb\x8c\x71\xd8\xef\x0d\xf1\xee\x46\x5b\x0a\xfb\x3d\xfa\x70\xeb\x5c\x5d\x84\x37\x56\x70\x09\xca\xf4\x3e\x2f\xd1\x85\xb7\xfa\x64\xfb\x1f\x9d\x2b\xbb\x5f\xeb\x16\xe6\x8b\xd5\xad\x7f\xe1\xf8\xd8\x48\x58\xfc\x8d\xd6\x08\xdd\x6e\x6c\xdf\xb5\xae\x6d\x18\xfd\x3a\x43\xb1\x80\xd1\xda\x09\xc2\x95\x77\x7d\xed\xf4\x34\x7a\x8c\xe6\x81\x16\x05\x64\x39\x87\x84\x36\x71\x9d\xdf\x53\x20\x24\xc9\x6b\xfe\xb4\x24\x6d\xd9\xb4\x55\xc5\x6a\x4e\x13\x20\x24\x2a\x1e\xa3\xa7\x06\x5e\x5e\x80\xc6\x0f\x0c\xaa\x9a\x92\x98\x6d\xb7\x39\xc7\xc8\xb9\xb6\xd6\x76\xf8\xd9\xf6\x37\x8e\xe7\x0a\xe8\x77\xca\xab\xa0\x83\x49\x42\x77\x64\xbe\x18\xfc\x63\x84\x36\xb6\xff\xd9\xf6\xc3\x0f\x8e\x6b\xf9\x77\xa0\xd8\x0c\xe7\xc7\x46\x43\xeb\x1d\xad\x95\xa1\x3c\xb7\xb4\x1b\x6b\x8a\x8d\x78\x9b\x1c\x59\x77\x84\x06\xad\xf3\x14\x74\x9f\x66\x79\xc3\xeb\x27\xd8\xef\x3b\xf5\x87\xa1\x88\x00\x2d\x13\xb9\x20\x43\x61\xce\x17\x93\x53\x61\x05\x3d\xc4\x02\x7a\x2e\x47\xc1\xc1\xc6\x45\x17\x8e\x34\x2f\xa8\x2e\x59\x49\x0a\x5f\x72\xfe\xb0\x8e\x38\x7d\x8c\x84\x5b\xb4\xb6\x02\xfb\x8b\x75\xf7\x23\x0d\xb2\xde\xfa\x60\xfa\x5f\x2a\x1c\xdb\xff\xba\x0e\x44\x42\x9e\xea\xa1\x7c\xfc\x94\x20\x8a\xe0\xc1\x15\x0a\xec\x4d\x10\xde\xba\x4e\x10\x5e\x79\xeb\xe1\xd2\x72\xda\xf0\xb0\x2d\x73\xae\x17\x2c\x43\x32\x31\x82\xbb\x1b\x1b\xde\x2d\x61\x96\xd0\x34\x6a\x0b\x3e\x43\x79\x4a\xff\x81\x85\x12\x4d\xac\xe3\xdf\x87\x65\x8c\xb4\xb5\x27\xd3\x69\xfc\x13\x3c\x8d\x8c\x21\x6d\xe3\xaf\x84\x78\xa1\xe7\x86\x97\xde\x26\x18\x56\x55\x62\x24\x79\x5d\x0a\x21\xe6\x8b\xe8\xbe\xa9\x22\xfe\x00\xf3\x45\x11\x35\xfc\x91\xd5\x09\xcc\x17\xd7\xd6\x27\xbb\x3b\xe8\x95\xb3\x09\x30\xc6\x78\x80\x74\xdc\x70\xe5\xb9\x81\xe5\xb8\xb6\xdf\x23\x4a\x2a\xd8\x68\xea\xd8\x38\x8a\x5e\x47\x74\x65\xad\x2e\xed\x13\xa2\xa4\xfa\x96\x25\x79\x0d\xf3\xc5\x6b\xd0\xd8\x38\xba\x31\x8c\xc4\x51\xfc\x40\x91\x86\xb4\x3e\x10\xa1\x7f\xeb\xba\xb6\x3f\x86\xec\x0b\x06\xd4\x6d\x09\x84\xd4\xdb\x73\x96\xbf\x2d\x81\xec\x46\x7e\xa5\x4a\xd8\x3c\x43\xe5\x80\xd3\x11\x3a\x00\x09\x8f\x79\x99\xb2\xfb\x82\x7d\x37\xee\xdb\xbc\x48\x38\x63\x85\xb9\xfb\xf3\x60\xbf\xb6\x5d\xdb\xb7\x02\xcf\x3f\xb1\x8f\x39\x33\x32\x5a\xf6\x1b\xfe\x40\xda\x14\x19\xc6\x01\x9b\x9c\x01\x03\x79\x3c\xa7\xd8\x60\x2b\xd1\x84\xfa\x13\x06\x3f\xc2\x3d\x4c\x1c\xb6\x60\x44\xcb\x24\x4f\x11\x5a\x7b\x3d\x62\xf8\xf1\xca\x5a\x6f\x64\x15\x54\x71\xc5\x40\x72\x20\x3b\x61\xd4\x5d\x79\x69\x23\x8c\xc8\x0e\x48\xcc\x44\xa1\x50\x8b\x37\xd6\xea\x93\xb5\xb6\x37\xe3\xab\x28\xe3\x2c\x38\x64\x0c\x8a\xbc\xe1\xa0\x1b\xba\xae\xc3\x0b\x64\x35\xad\x04\xca\x4c\x37\x76\xb4\x4c\x58\x6d\xcc\x44\xbd\xb2\xfc\xd5\x65\xb8\xf6\xc4\x05\xdd\x8c\x8b\x8b\x80\x48\xf3\x32\x01\x1d\x48\xc9\x38\x90\xee\x62\xbf\x79\xab\x36\xbf\x7d\x03\x84\x3f\x55\x14\x52\x20\xdd\xed\x9f\xbd\xd5\x33\x36\x43\x48\xbf\xb9\xf4\xdc\x3b\x13\x64\x7e\x21\xf9\x34\xbb\x6c\x85\xbe\xd8\xbd\x5a\xeb\x40\xe6\xfd\x90\xf6\x07\xac\xa8\x28\x50\x54\x14\x26\xf4\xce\xa1\xaa\x19\x67\xf7\x6d\xfa\x2b\x98\xe9\x96\xa3\x74\xcb\x4d\xa4\xbd\x9f\x2f\xa6\x3a\x60\x20\xf4\x3b\x8d\x21\x63\xe9\x96\x03\x69\xc4\x3d\x79\xde\xc3\xd7\xbf\x86\xdd\xc2\x31\x12\x7f\x3d\x90\xc0\x18\x2b\xdf\xf1\xea\xe2\x3a\xc4\x11\x8f\x26\x54\xec\xf0\x80\x28\xdb\x40\xff\x50\x43\xd2\xa5\x82\x1a\xa8\x1e\x3e\xdd\xd2\xdb\xa0\xf1\xc0\x3c\x21\xd4\xe3\x74\x04\x46\xd7\x0f\x03\x61\x22\x03\xc6\x7d\x16\x0f\x13\x5d\xb5\x38\x71\x27\x59\x4c\x46\x47\x5c\xb4\xf7\xb2\x7a\xf4\x6e\x49\x3a\x60\x0e\x85\x1f\x03\xe1\xc3\x7c\xd7\x38\x30\xe8\x67\xfa\xa0\xe2\xa0\x7a\x83\xea\x38\x6a\x42\x0a\xa5\x46\x92\xe3\xff\xa1\xc2\xc4\x21\x9a\x8c\x7e\x52\xf6\x69\x6f\xc7\xa3\x99\x33\x2e\xe5\xa9\xa6\x43\xf3\x55\xb5\x4f\x1b\xaf\x94\x7b\xd2\xf5\xa5\xde\x32\x35\x9e\x9f\xc9\x71\xf7\x3f\x50\xa8\xda\xe6\x01\x89\xbf\x91\x3b\x31\x3c\x0e\xe0\xeb\xd1\x3b\xde\x32\x25\x31\x66\xa0\xde\x0e\x7e\x65\xa6\x23\xf5\xd2\x6b\x3c\xd4\x55\xf8\x8a\x34\x42\x32\x16\xb2\x96\x2f\xab\xa2\xcd\xf2\xb2\x59\x66\x75\x15\x9b\xba\x58\x7a\x85\x0f\x11\x84\x08\x11\x36\xea\xc3\xa5\xdb\x5c\xb0\x8c\xb3\x86\x27\xb4\xae\x97\xbc\x6e\xe9\x01\x40\x50\x92\x9b\x76\x51\x91\x27\x11\xa7\xdd\x86\x59\x11\x95\xd9\x32\x63\xa6\x3e\xeb\x59\x34\x8f\x51\x96\xd1\xba\x5b\x34\xf5\x93\x8f\xaf\xee\x08\xdd\x47\x68\x1e\x53\xbd\x1b\x0d\x31\xee\x2b\x1b\xea\x1f\x26\xd2\x46\xf7\x28\xa1\x15\xd0\xb2\x69\x6b\x0a\xa4\x5f\x27\xac\x2c\x9e\x8e\xf7\x92\xb6\x12\xd4\xd0\x64\x74\x0e\x09\xfd\x1b\x00\x00\xff\xff\x59\x49\x12\x90\x72\x0c\x00\x00")
+var _templatesMakefileGotmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x56\xdf\x8f\x9b\x38\x10\x7e\xc6\x7f\xc5\x28\x8a\xd4\xb8\x77\x06\xdd\xdb\x89\x53\xd4\xd2\x2c\xcd\xe6\xba\x0b\x2b\xc2\xb6\x5a\xa9\x12\x62\xc1\xb0\xa8\x04\x73\x60\xb2\x5d\x65\xf7\x7f\x3f\x19\x6c\x7e\x24\x9b\x9e\xaa\xea\xf2\x10\xb0\x3d\xfe\xe6\xf3\x37\x9e\x19\x6e\x3c\xf7\x6f\x7b\xe5\x07\x9e\xeb\xfa\xa0\x69\x9a\x66\x2e\xe1\x70\x80\x2c\x01\xdd\x63\x8c\xc3\xcb\xcb\xe1\xd0\xbf\x1a\xe2\xdd\x09\x77\xb4\x9b\xa6\x79\x2d\xdf\xc6\x93\x45\x0c\x2f\x2f\xe8\xc3\xed\xe6\xea\x22\xb8\xb1\xfc\x4b\x50\xb0\xf7\x59\x81\x2e\xdc\xd5\x27\xdb\xfb\xb8\xb9\xb2\xbb\xb5\x76\x61\xbe\x58\xdd\x7a\x17\x1b\x0f\x1b\x31\x8b\xbe\xd1\x0a\xa1\xdb\xad\xed\x39\xd6\xb5\x0d\xa3\x5f\x6b\x28\x16\x30\x5a\x6f\xfc\x60\xe5\x5e\x5f\x6f\x3a\xca\x1d\x46\xfd\x40\xf3\x1c\xd2\x8c\x43\x4c\xeb\xa8\xca\xee\x29\x10\x12\x67\x15\x7f\x5a\x92\xa6\xa8\x9b\xb2\x64\x15\xa7\x31\x10\x12\xe6\x8f\xe1\x53\x0d\xcf\xcf\x40\xa3\x07\x06\x65\x45\x49\xc4\x76\xbb\x8c\x63\xb4\xb9\xb6\xd6\x76\xf0\xd9\xf6\xb6\x1b\xd7\x11\xd0\xef\x94\x57\x41\x07\x93\x98\xee\xc9\x7c\x31\xf8\xc7\x08\x6d\x6d\xef\xb3\xed\x05\x1f\x36\x8e\xe5\xdd\x81\x62\x33\x9c\x1f\x1b\x35\xad\xf6\xb4\x52\x86\xf2\xdc\xd2\x6e\xac\x3f\x36\xa2\x5d\x7c\x64\xdd\x12\x3a\x8a\x0b\x4d\xb3\x9a\x57\x4f\x2a\x36\xc3\xd0\xe8\xf5\x1f\xc5\xc4\x9c\x2f\x26\xa7\xc2\x0a\x7a\x88\x05\x74\x5c\x8e\x82\x83\x8d\x8b\x36\x1c\x49\x96\x53\x5d\xb2\x92\x14\xbe\x64\xfc\x61\x1d\x72\xfa\x18\x0a\xb7\x68\x6d\xf9\xf6\x17\xeb\xee\x47\x1a\xa4\x9d\x75\x6f\xfa\x5f\x2a\x1c\xdb\xff\xba\x0e\x44\x42\x9e\xea\xa1\x7c\xfc\x94\x20\x8a\xe0\x70\xe5\x7d\x7b\xeb\x07\xb7\xce\xc6\x0f\xae\xdc\xf5\x70\x69\x39\xad\x79\xd0\x14\x19\xd7\x73\x96\x22\x99\x18\xfe\xdd\x8d\x0d\xef\x96\x30\x8b\x69\x12\x36\x39\x9f\xa1\x2c\xa1\xff\xc0\x42\x89\x26\xd6\xf1\xef\xc3\x32\x46\xda\xda\x95\xe9\x34\xfe\x09\x9e\x46\xca\x90\xb6\xf5\x56\x42\xbc\xc0\x75\x82\x4b\x77\xeb\x0f\xab\x2a\x31\xe2\xac\x2a\x84\x10\xf3\x45\x78\x5f\x97\x21\x7f\x80\xf9\x22\x0f\x6b\xfe\xc8\xaa\x18\xe6\x8b\x6b\xeb\x93\xdd\x1e\xf4\x6a\xb3\xf5\x31\xc6\x78\x80\xdc\x38\xc1\xca\x75\x7c\x6b\xe3\xd8\x5e\x87\x28\xa9\x60\xa3\xae\x22\xe3\x28\x7a\x2d\xd1\x95\xb5\xba\xb4\x4f\x88\x92\xf2\x5b\x1a\x67\x15\xcc\x17\xaf\x41\x63\xe3\xe8\xc6\x30\x12\x85\xd1\x03\x45\x1a\xd2\xba\x40\x04\xde\xad\xe3\xd8\xde\x18\xb2\x2b\x18\x50\x35\x05\x10\x52\xed\xce\x59\xfe\xb6\x04\xb2\x1f\xf9\x95\x2a\x61\xf3\x0c\x95\x1e\xa7\x25\xd4\x03\x09\x8f\x59\x91\xb0\xfb\x9c\x7d\x37\xee\x9b\x2c\x8f\x39\x63\xb9\xb9\xff\xb3\xb7\x5f\xdb\x8e\xed\x59\xbe\xeb\x9d\xd8\x47\x9c\x19\x29\x2d\xba\x0d\x7f\x20\x6d\x8a\x0c\xe3\x80\x4d\xce\x80\x81\x3c\x9e\x53\x6c\xb0\x95\x68\x42\xfd\x09\x83\x1f\xe1\xf6\x13\xfd\x16\x8c\x68\x11\x67\x09\x42\x6b\xb7\x43\x0c\x3e\x5e\x59\xeb\xad\xac\x82\x2a\xae\x18\x48\x06\x64\x2f\x8c\xda\x2b\x2f\x6d\x84\x11\xd9\x03\x89\x98\x28\x14\x6a\xf1\xc6\x5a\x7d\xb2\xd6\xf6\x76\x7c\x15\x65\x9c\x05\x87\x94\x41\x9e\xd5\x1c\x74\x43\xd7\x75\x78\x86\xb4\xa2\xa5\x40\x99\xe9\xc6\x9e\x16\x31\xab\x8c\x99\xa8\x57\x96\xb7\xba\x0c\xd6\xae\xb8\xa0\xdb\x71\x71\x11\x10\x49\x56\xc4\xa0\x03\x29\x18\x07\xd2\x5e\xec\x37\x6f\xd5\xe6\xb7\x6f\x80\xf0\xa7\x92\x42\x02\xa4\xbd\xfd\xb3\xb7\x7a\xca\x66\x08\xe9\x37\x97\xae\x73\x67\x82\xcc\x2f\x24\x9f\x66\x9b\xad\xd0\x15\xbb\x57\x6b\x1d\xc8\xbc\x1f\xd2\xbe\xc7\x0a\xf3\x1c\x85\x79\x6e\x42\xe7\x1c\xca\x8a\x71\x76\xdf\x24\xbf\x82\x99\xec\x38\x4a\x76\xdc\x44\xda\xfb\xf9\x62\xaa\x03\x06\x42\xbf\xd3\x08\x52\x96\xec\x38\x90\x5a\xdc\x93\xc3\x0b\x7c\xfd\x6b\xd8\x2d\x1c\x23\xf1\xd7\x01\x09\x8c\xb1\xf2\x2d\xaf\x36\xae\x43\x1c\xf1\x68\x42\xc5\x0e\x0f\x88\xb2\x0d\x74\x0f\x35\x24\x6d\x2a\xa8\x81\xea\xe1\xd3\x2d\x9d\x0d\x1a\x0f\xcc\x13\x42\x1d\x4e\x4b\x60\x74\xfd\x30\x10\x26\x32\x60\xdc\x67\xf1\x30\xd1\x56\x8b\x13\x77\x92\xc5\x64\x74\xc4\x45\x7b\x2f\xab\x47\xe7\x96\x24\x03\xe6\x50\xf8\x31\x10\x3e\xcc\xb7\x8d\x03\x83\x7e\xa6\x0f\x2a\x0e\xaa\x37\xa8\x8e\xa3\x26\xa4\x50\x6a\x24\x39\xfe\x1f\x2a\x4c\x1c\xa2\xc9\xe8\x27\x65\x9f\xf6\x76\x3c\x9a\x39\xe3\x52\x9e\x6a\x3a\x34\x5f\x55\xfb\xb4\xf1\x4a\xb9\x27\x5d\x5f\xea\x2d\x53\xe3\x70\x20\xc7\xdd\xbf\xa7\x50\x36\xf5\x03\x12\x7f\x23\x77\x62\x78\x1c\xc0\xd7\xa3\x77\xbc\x65\x4a\x62\xcc\x40\xbd\xf5\x7e\x65\xa6\x23\xf5\xd2\x69\x3c\xd4\x55\xf8\x8a\x34\x42\x52\x16\xb0\x86\x2f\xcb\xbc\x49\xb3\xa2\x5e\xa6\x55\x19\x99\xba\x58\x7a\x85\x0f\x11\x84\x08\x11\x36\xea\xc3\xa5\xdd\x9c\xb3\x94\xb3\x9a\xc7\xb4\xaa\x96\xbc\x6a\x68\x0f\x20\x28\xc9\x4d\xfb\x30\xcf\xe2\x90\xd3\x76\xc3\x2c\x0f\x8b\x74\x99\x32\x53\x9f\x75\x2c\xea\xc7\x30\x4d\x69\xd5\x2e\x9a\xfa\xc9\xc7\x57\x7b\x84\xf6\x23\x34\x8b\xa8\xde\x8e\x86\x18\x77\x95\x0d\x75\x0f\x13\x69\xa3\x7b\x14\xd3\x12\x68\x51\x37\x15\x05\xd2\xad\x13\x56\xe4\x4f\xc7\x7b\x49\x53\x0a\x6a\x68\x32\x3a\x87\x84\xfe\x0d\x00\x00\xff\xff\xf7\x2b\x38\x8d\x9e\x0c\x00\x00")
 
 func templatesMakefileGotmplBytes() ([]byte, error) {
 	return bindataRead(
@@ -114,7 +114,7 @@ func templatesMakefileGotmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "templates/Makefile.gotmpl", size: 3186, mode: os.FileMode(420), modTime: time.Unix(1522342462, 0)}
+	info := bindataFileInfo{name: "templates/Makefile.gotmpl", size: 3230, mode: os.FileMode(420), modTime: time.Unix(1523484266, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -134,7 +134,7 @@ func templatesReadmeMdGotmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "templates/README.md.gotmpl", size: 1227, mode: os.FileMode(420), modTime: time.Unix(1522344113, 0)}
+	info := bindataFileInfo{name: "templates/README.md.gotmpl", size: 1227, mode: os.FileMode(420), modTime: time.Unix(1523468144, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -154,12 +154,12 @@ func templatesCmdConfigConfigGoGotmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "templates/cmd/config/config.go.gotmpl", size: 167, mode: os.FileMode(420), modTime: time.Unix(1522341651, 0)}
+	info := bindataFileInfo{name: "templates/cmd/config/config.go.gotmpl", size: 167, mode: os.FileMode(420), modTime: time.Unix(1523485304, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
 
-var _templatesCmdGatewayHandlerGoGotmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x7c\x90\xb1\x6e\xa3\x40\x10\x86\x6b\xf6\x29\xfe\xeb\x40\x42\xeb\xde\x92\x2b\xdf\x9d\x7c\xc5\xd9\x96\xcf\xd2\x15\x51\x8a\x0d\x8c\x61\x15\x18\xd0\x30\xd8\x44\x84\x77\x8f\xd6\x98\x54\x51\xaa\xd5\xfc\xda\xf9\x66\xbe\x69\x5d\xf6\xea\x0a\x42\xed\x3c\x1b\xb3\x5a\x61\x4f\xb7\x71\x84\xdd\xbb\x9a\xf0\x8e\x7f\x24\x57\x9f\xd1\x34\xed\x1c\xe7\x15\x09\x84\xb4\x17\xee\xe0\x18\xbb\xf3\xf9\x88\xf2\x91\x6b\xe9\x14\x1d\xc9\x95\x3a\x68\x49\x28\x4e\xc7\x2d\x0a\xa7\x74\x73\x6f\xe6\xd2\x73\xf6\x35\x18\x9f\xe4\x38\xd3\x01\x59\xc3\x4a\x83\xda\xed\xfc\xa6\x70\x79\x2e\xe8\x54\x3c\x17\x29\x9a\x56\x3b\x58\x6b\xa5\x67\xf5\x35\xd9\xc0\xa0\xbf\xfd\x70\x68\xd5\x37\x9c\x20\x2e\x55\x5b\xfb\xe0\xa5\x20\x91\x46\x12\x8c\x26\xaa\xfb\x01\xeb\x0d\x96\xbe\x3d\xdd\x96\xd6\x38\x30\xad\xb5\x89\x89\x72\xef\xaa\x43\x98\xb0\xde\xe0\xe9\xb9\x90\x36\xb3\x3f\xe7\xc8\x37\x3c\xde\xeb\xff\x5e\xcb\x3f\xdc\x51\xd6\x0b\xc5\xc9\x64\x22\x12\x09\xdf\xdb\x17\x7b\xa2\xc2\x77\x4a\xf2\x9d\xe2\x6f\x69\xea\x5f\x9c\xb7\x8d\x67\x0d\xba\x29\xea\x7e\x98\x1d\x53\x2c\xe3\x13\x13\xf9\x4b\xd8\x1d\x3f\x36\x60\x5f\x85\xfd\xa3\xf9\xea\xa1\xbc\x6b\x99\x68\x32\x4b\x76\x47\xb0\xaf\xcc\x64\x3e\x02\x00\x00\xff\xff\xf4\xfc\xbe\xcb\xcc\x01\x00\x00")
+var _templatesCmdGatewayHandlerGoGotmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x7c\x90\xb1\x6e\xdc\x30\x0c\x40\x67\xf3\x2b\xd8\x9b\x6c\xc0\x95\xf7\x00\x37\x14\x69\x8b\x74\xe8\x25\x48\x03\x74\x28\x3a\x28\x32\x23\x0b\xb5\x29\x83\xa2\x73\x3e\x5c\xfd\xef\x85\x7c\xbe\x76\x29\x32\x49\x24\xc8\x47\x3e\x8e\xd6\xfd\xb2\x9e\x70\xb0\x81\x01\xc2\x30\x46\x51\x2c\xa1\xd8\xb9\xc8\x4a\xb3\xee\xa0\xd8\x31\x69\xd3\xa9\x8e\xf9\xef\x83\x76\xd3\xb3\x71\x71\x68\xbc\x8c\xee\x3d\xb9\x98\x4e\x49\x69\x0b\xbd\x55\x3a\xda\x53\x23\x13\x6b\x18\x68\xed\x88\xd1\xf7\x64\x7c\xec\x2d\x7b\x13\xc5\xaf\x95\x3b\xa8\x00\x9a\x06\x0f\x74\x3c\x9f\xd1\x1c\xec\x40\xf8\x1b\xbf\x91\xbc\x06\x47\xcb\x72\x67\xb9\xed\x49\x50\x48\x27\xe1\x84\x96\xf1\xee\xe9\xe9\x01\xbb\x2d\xaf\x9d\x55\x4c\x24\xaf\x94\x50\x3b\x42\xff\xf8\x70\x8b\xdb\x70\x78\x99\xd8\xfd\x1f\x8c\x7f\xc9\xa5\xd3\x19\x37\x47\x73\x7b\x79\x6b\xcc\x9b\x7d\x68\x5b\xc1\xa4\x12\xd8\xd7\x18\x47\x4d\x68\x8c\xd9\x7c\x4c\xe6\xd0\xd7\x69\xbe\x1f\x35\x44\xae\xb0\xcc\x77\x31\x1b\xb3\x46\x12\x89\x52\xe1\x19\x8a\x61\x9a\xf1\x66\x8f\xd7\xbe\x03\x1d\xaf\xad\x65\x66\x1a\x63\x2a\x28\xda\x60\xfb\xfb\x3c\xe1\x66\x8f\x3f\x7e\xe6\xe1\xe6\xe3\x25\x15\x22\x9f\xd7\xf8\x7b\xd0\xee\x0b\x27\x72\x93\x50\x59\x2d\x50\x90\x48\x2e\x1f\x9f\xcd\x23\xf9\x90\x94\xe4\x2d\xcd\xcf\x12\x87\x4f\xdc\x8e\x31\xb0\x66\xe5\x1a\x87\x69\xfe\xe7\x59\xe3\x75\x85\x0a\x8a\xf0\x92\xf7\xc7\x77\x7b\xe4\xd0\x67\x87\xe2\x72\xfd\x1c\xae\x6a\x50\x2c\x70\xcd\xad\x18\x0e\x3d\x2c\xf0\x27\x00\x00\xff\xff\x3f\xd4\x1f\xb5\x43\x02\x00\x00")
 
 func templatesCmdGatewayHandlerGoGotmplBytes() ([]byte, error) {
 	return bindataRead(
@@ -174,12 +174,12 @@ func templatesCmdGatewayHandlerGoGotmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "templates/cmd/gateway/handler.go.gotmpl", size: 460, mode: os.FileMode(420), modTime: time.Unix(1522341651, 0)}
+	info := bindataFileInfo{name: "templates/cmd/gateway/handler.go.gotmpl", size: 579, mode: os.FileMode(420), modTime: time.Unix(1523486774, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
 
-var _templatesCmdGatewayMainGoGotmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x74\x53\xcd\x6e\xdb\x3c\x10\x3c\x8b\x4f\xb1\x9f\x0e\x1f\x24\xc0\x91\x90\x6b\x8a\x1c\xdc\xc6\x49\x0e\x49\x60\xd8\xf9\x41\x51\x14\xc1\x56\x5a\xc9\x6c\x28\xd2\x5d\x52\xb6\x83\xd4\xef\x5e\x90\x92\xfc\x93\x20\x27\x9b\xcb\xe5\xec\xcc\xec\x68\x89\xc5\x0b\xd6\x04\x0d\x4a\x2d\xc4\x0a\x19\x12\x11\xcd\x89\x57\xc4\xe3\xb2\x64\x00\xeb\x58\xea\x5a\x44\x57\xe8\x68\x8d\xaf\xa1\x38\xd4\xe6\x6b\xac\x6b\xe2\x0b\xb9\xef\x4b\x85\xa8\x5a\x5d\x04\xbc\x24\x85\x37\x11\xe5\x39\x14\x4c\xe8\x08\xae\xef\xef\xa7\xb0\x40\x5d\x2a\x62\xa8\x0c\x43\xdd\x61\x8a\x88\x98\xaf\xfb\xfa\xd9\x39\x70\xab\x9d\x6c\x28\x7b\x92\x6e\x31\x65\xe3\xcc\x84\xd9\x0c\x0d\x49\xbd\xce\x42\xf1\x96\xac\xc5\x9a\x0e\xef\x52\x11\xd9\x40\xbd\x3f\x8f\x80\x38\x20\xde\xd1\xfa\xed\x0d\xb2\x3b\x6c\x08\xfe\x82\x97\x27\x0b\x82\xed\x76\xc0\x2c\x8c\x76\xb4\x71\xd9\x57\x2c\x5e\x6a\x36\xad\x2e\x93\x74\x04\x7b\x1b\x02\xd0\x7e\x48\x9e\x07\xb9\x4b\x40\xa5\xe0\x57\xeb\xc0\x31\x4a\x25\x75\x0d\x71\x1e\x83\xd1\x20\x75\x61\x1a\x7f\x66\xfa\xd3\x92\x75\xf6\x1d\x31\x38\x87\x85\x73\xcb\x6c\xee\x51\xa6\x4c\x95\xdc\x24\x22\x8a\x0a\xa3\x2b\x59\x67\x57\xe3\xfb\xc9\xd3\xf8\xfb\xf3\xc3\xec\xe6\xc7\x99\x22\x9d\x7c\xac\xa7\x27\xa7\x3f\x47\x22\x7a\x27\x57\x44\xa9\x88\x64\x15\x54\xff\x77\x0e\x5a\x2a\xbf\x80\x48\x99\x3a\xbb\x44\x87\x4a\xe9\x84\xd8\x0b\xd8\x06\x0d\x0d\x2e\xbb\x9d\x90\x2e\x97\x46\x6a\x67\xc1\x99\x61\x41\x56\x44\x4d\xbb\xf1\xe6\x05\xa6\x77\xb4\x0e\x76\xdc\xb6\x9b\x24\x0d\x57\x59\x37\x35\x89\xf3\x03\x6b\x1f\x66\x37\xb0\xdd\xe6\xab\xd3\x3c\x1e\xc1\x11\xb9\xa3\x47\x97\xad\x2e\x92\x38\xb7\x5d\x7e\x7c\x6f\x1f\xa5\x63\x8f\xfd\xfb\x1d\x1f\xef\xab\x5b\xd0\x10\x1a\xc0\xb2\x64\xb2\x56\x44\x81\xdf\x8d\xb4\x8e\xf4\x58\x97\x81\x65\x72\x90\xd6\x11\x34\xed\x26\x15\xdb\x3e\x98\x52\x4b\xb7\x0b\x66\x49\x15\xb6\xca\xed\x30\x57\xa8\x5a\xb2\x5f\xc0\x2c\x9d\x34\x1a\x95\x7a\x85\xce\xfb\x96\xa9\x84\x95\x44\x28\x4c\xd3\xa0\x2e\x4f\x94\xd4\x04\x95\xc2\xda\x8a\xc8\xff\x84\x55\xea\xfa\x11\x39\xf9\xff\x30\x37\x71\x67\x42\x3c\xea\x81\xb2\xf9\x64\xf6\x38\x99\x3d\x8f\x2f\x2e\x66\x93\xf9\x7c\x04\x71\xaf\x03\x4c\xd5\xc9\x9b\x4d\xbf\xf5\xce\xc5\xe9\x47\xec\x23\x61\x71\xcf\x7b\x8f\x3e\x44\xe4\x73\xf8\x5e\xe9\xe7\x13\xf6\x1f\xb5\x67\xdf\x1d\x4e\x4a\xe9\x25\xc4\x76\x81\x4c\xfe\x4f\x29\x99\x0a\x67\xf8\x75\xc0\xed\x1b\xb3\xdf\xd6\x68\xa8\xa4\xa2\x1d\xf4\x14\xd9\x52\xe2\x17\xf0\x2f\x00\x00\xff\xff\x7d\x08\x9d\x84\x6c\x04\x00\x00")
+var _templatesCmdGatewayMainGoGotmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x74\x53\xcb\x6e\xc3\x36\x10\x3c\x8b\x5f\xb1\xe5\xa1\x90\x00\x5b\x42\xae\x29\x72\x70\x1b\x27\x39\x24\x81\x61\xe7\x81\xa2\x28\x02\x46\x5a\xd1\x6c\x28\x52\x5d\x52\x7e\x20\xf5\xbf\x17\xa4\xe4\x57\x82\x9c\x28\xae\x96\xc3\x99\xd9\x61\x2b\xca\x0f\x21\x11\x1a\xa1\x0c\x63\xaa\x69\x2d\x79\x48\x59\xc2\x4b\x6b\x3c\x6e\x3c\x67\x09\xaf\xb5\x90\x61\xd5\x36\x2e\x06\x7d\xb1\xf4\xbe\x0d\xdf\x52\xf9\x65\xf7\x9e\x97\xb6\x29\x24\xb5\xe5\x18\x4b\xeb\xb6\xce\xe3\xb0\x95\xc2\xe3\x5a\x6c\x0b\xea\x8c\x57\x0d\x7e\x39\xa1\x4c\x6d\xdf\xb5\xdd\xd8\x16\x4d\x21\xbc\x16\x6e\x2c\xda\x76\xec\xad\xd5\x1f\xca\x17\x72\xcd\x59\xc6\xd8\x4a\x50\x20\xb4\x40\x5a\x21\x4d\xaa\x8a\x00\x9c\x27\x65\x24\x4b\x6e\x7b\xf8\x58\xdc\xd7\x16\x6b\x21\x25\xd2\xb5\x3a\xf6\x65\x8c\xd5\x9d\x29\xa3\xc6\x34\x83\x4f\x96\x14\x05\x94\x84\xc2\x23\xdc\x3d\x3d\xcd\x60\x29\x4c\xa5\x91\xa0\xb6\x04\x03\x65\x96\x20\xd1\xdd\x50\xbf\xbc\x82\x41\x41\xfe\xaa\xfc\x72\x46\xd6\xdb\x29\x91\xdd\x37\xa4\x72\x9d\xc7\xe2\x03\x3a\x27\x24\x9e\xfe\xcb\x58\xe2\x22\xf5\x61\x3f\x02\xa4\x88\xf8\x88\xeb\xcf\x4f\xc8\x1f\x45\x83\xf0\x1f\x04\x79\xaa\x44\xd8\xed\xf6\x98\xc3\x00\xf2\xdf\x45\xf9\x21\xc9\x76\xa6\x4a\xb3\x11\x1c\x6d\x88\x40\xc7\x4b\x8a\x22\xca\x6d\x41\x68\x0d\xef\x9d\x07\x4f\x42\x69\x65\x24\xf0\x82\x83\x35\xa0\x4c\x69\x9b\xb0\x27\xfc\xb7\x43\xe7\xdd\x17\x62\x70\x05\x61\xaa\xf9\x22\xa0\xcc\x08\x6b\xb5\x49\x59\x92\x94\xd6\xd4\x4a\xe6\xb7\x93\xa7\xe9\xeb\xe4\xcf\xb7\xe7\xf9\xfd\x5f\x97\x1a\x4d\xfa\xbd\x9e\x8d\x2f\xfe\x1e\xb1\xe4\x8b\x5c\x96\x64\x2c\x51\x75\x54\xfd\xcb\x15\x18\xa5\xc3\x00\x12\x6d\x65\x7e\x23\xbc\xd0\xda\xa4\x48\x41\xc0\x2e\x6a\x68\x44\xdb\xcf\x04\x4d\xd5\x5a\x65\xbc\x03\x6f\xf7\x03\x72\x2c\x69\xba\x4d\x30\x2f\x32\x7d\xc4\x75\xb4\xe3\xa1\xdb\xa4\x59\xfc\x95\xf7\xb7\xa6\xbc\x38\xb1\xf6\x79\x7e\x0f\xbb\x5d\xb1\xba\x28\xf8\x08\xce\xc8\x9d\x1d\xba\xe9\x4c\x99\xf2\xc2\xf5\xf9\x09\xbd\x43\x94\xce\x3d\x0e\xe7\x0f\x7c\x82\xaf\x7e\x89\xfb\xd0\x80\xa8\x2a\x42\xe7\x58\x12\xf9\xdd\x2b\xe7\xd1\x4c\x4c\x15\x59\xa6\x27\x69\x1d\x41\xd3\x6d\x32\xb6\x1b\x82\xa9\x8c\xf2\x87\x60\x56\x58\x8b\x4e\xfb\x03\xe6\x4a\xe8\x0e\xdd\x6f\x60\x5b\xaf\xac\x11\x5a\x6f\xa1\xf7\xbe\x23\xac\x60\xa5\x04\x94\xb6\x69\x84\xa9\xc6\x5a\x19\x84\xf0\x58\x1d\x4b\xc2\x12\x47\x69\xe4\x8b\xa0\xf4\xd7\xd3\xdc\xf0\xde\x04\x3e\x1a\x80\xf2\xc5\x74\xfe\x32\x9d\xbf\x4d\xae\xaf\xe7\xd3\xc5\x62\x04\x7c\xd0\x01\xb6\xee\xe5\xcd\x67\x7f\x0c\xce\xf1\xec\x3b\xf6\x99\x30\x3e\xf0\x3e\xa2\xef\x23\xf2\x33\xfc\xa0\xf4\xe7\x1b\x8e\x8f\x3a\xb0\xef\x37\xe3\x4a\x05\x09\xdc\x2d\x05\x61\xf8\xa8\x14\x61\xe9\x2d\x6d\xf7\xb8\x43\x63\xfe\x8f\xb3\x06\x6a\xa5\xf1\x00\x3d\x13\xe4\x30\x0d\x03\xf8\x3f\x00\x00\xff\xff\x39\x94\xbc\x0f\x00\x05\x00\x00")
 
 func templatesCmdGatewayMainGoGotmplBytes() ([]byte, error) {
 	return bindataRead(
@@ -194,12 +194,12 @@ func templatesCmdGatewayMainGoGotmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "templates/cmd/gateway/main.go.gotmpl", size: 1132, mode: os.FileMode(420), modTime: time.Unix(1522341651, 0)}
+	info := bindataFileInfo{name: "templates/cmd/gateway/main.go.gotmpl", size: 1280, mode: os.FileMode(420), modTime: time.Unix(1523486772, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
 
-var _templatesCmdGatewaySwaggerGoGotmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x5c\x8f\x41\x4b\xf4\x40\x0c\x86\xcf\x3b\xbf\x22\x0c\x7c\xd0\xfd\x2c\xd3\xbb\xd0\x9b\xc8\x22\x1e\xca\x6e\xc5\xf3\x50\xd3\x99\xd1\x6e\x3a\x4d\x52\x2b\x88\xff\x5d\xda\xed\xc9\x6b\xde\x3c\xc9\xf3\x66\xdf\x7d\xf8\x80\x70\xf5\x89\x8c\xa9\x2a\xb8\x2c\x3e\x04\xe4\x93\xa7\xb7\x01\x19\x18\x75\x66\x12\xf0\x04\xa7\xb6\x6d\x20\xee\x73\x8d\x5e\x41\x90\x3f\x51\x40\x23\x82\xdc\x30\x90\x8c\x9d\xe9\x67\xea\xfe\x1c\x2a\x78\x81\xa8\x9a\xdd\x19\x25\x8f\x24\xf8\xca\x49\x91\x4b\x60\x9c\xe0\xff\x9e\x4c\x33\x8a\x1e\xe1\xdb\x1c\x32\xdc\xd7\x20\xca\x89\x82\xb8\x96\xd3\xb5\x61\xec\xd3\x57\xc1\x38\xb9\x97\xf3\xb3\x6b\xbc\xc6\x12\x6c\xb5\xbf\xad\xec\x71\x65\x6a\xe8\xd3\x80\xd9\x6b\x74\x4f\x63\xa2\x62\x57\x78\x48\x5c\x42\xde\x36\xee\x6a\xb0\x6e\x87\xdc\xbb\x8c\x64\xcd\x61\x18\x83\x6b\x38\x91\xf6\x85\x5d\x1b\x25\x0a\xf0\x4f\xec\x0d\xd9\xcc\x2e\x6b\xcf\xc7\x34\x60\xc1\xcb\x66\xbc\x65\x3f\xe6\x37\x00\x00\xff\xff\x9b\x89\x3c\xbd\x3d\x01\x00\x00")
+var _templatesCmdGatewaySwaggerGoGotmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x5c\x8f\xc1\x4a\xc3\x40\x10\x86\xcf\xd9\xa7\x18\x16\x84\x54\xcb\xe6\x2e\xf4\x26\x52\xc4\x43\x68\x2b\x9e\x97\x3a\xd9\x8c\xa6\x93\xed\xcc\xd4\x08\xe2\xbb\xcb\xa6\xf1\xe2\x6d\x98\x7f\xbf\x9d\xef\xcf\xf1\xf8\x11\x13\xc2\x29\x12\x3b\x47\xa7\x3c\x8a\x41\xed\x2a\x3f\x8c\xc9\xbb\xca\x33\x5a\xd3\x9b\xe5\x32\xe7\x68\x7d\xd3\xd1\x80\x65\x28\x0b\x35\x21\x4e\xea\xdd\xca\xb9\xa6\x81\xfd\x14\x53\x42\xd9\x46\x7e\x1b\x50\x40\xd0\x2e\xc2\x0a\x91\x61\x7b\x38\xb4\xd0\x2f\x7b\xeb\xa3\x81\xa2\x7c\xa2\x82\xf5\x08\x7a\xc5\x40\x33\x1e\x5d\x77\xe1\xe3\xbf\x8f\x6a\x99\xa0\x28\x84\x1d\x6a\x1e\x59\xf1\x55\xc8\x50\xd6\x20\x78\x86\xdb\x25\x39\x5f\x50\x6d\x05\xdf\xae\xca\x70\xbf\x81\xc5\x2c\x1c\x84\x4e\xad\x60\x47\x5f\xb5\xe0\x39\xbc\xec\x9e\x43\x1b\xad\x5f\x83\x6f\x96\xb3\x8d\x5f\x15\x66\x03\x7f\xc5\xc2\xd3\x48\x5c\x2f\x0a\x0f\x24\x6b\xc8\xf3\x8b\xbb\x0d\xf8\xb0\x40\xe1\x5d\x47\xf6\xae\x1a\xc6\x14\x5a\x21\xb6\xae\xf6\xa5\x11\x71\x82\x1b\xf5\x57\x64\x36\xdb\x97\x9e\x8f\x34\x60\x2d\xd3\x6c\x3c\x67\x3f\xee\x37\x00\x00\xff\xff\xcd\xd6\xe8\xba\x78\x01\x00\x00")
 
 func templatesCmdGatewaySwaggerGoGotmplBytes() ([]byte, error) {
 	return bindataRead(
@@ -214,12 +214,12 @@ func templatesCmdGatewaySwaggerGoGotmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "templates/cmd/gateway/swagger.go.gotmpl", size: 317, mode: os.FileMode(420), modTime: time.Unix(1522341651, 0)}
+	info := bindataFileInfo{name: "templates/cmd/gateway/swagger.go.gotmpl", size: 376, mode: os.FileMode(420), modTime: time.Unix(1523486776, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
 
-var _templatesCmdServerMainGoGotmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x94\x53\x5f\x6b\xdb\x3e\x14\x7d\x96\x3e\xc5\xfd\xf9\xe1\x37\xbb\x38\xf6\x7b\x4b\x1f\xba\x36\x83\xc1\x28\x25\x61\x7d\x2d\xaa\x7c\xa3\x88\xc9\x92\xb9\x52\x1c\x42\xe6\xef\x3e\x24\x2b\x4d\x18\x1b\x2c\x2f\x16\xdc\x3f\xe7\x48\xe7\x1c\x0f\x42\xfe\x10\x0a\xa1\x17\xda\x72\xae\xfb\xc1\x51\x80\x92\xb3\xe3\xb1\xbd\x81\xb0\x45\x8f\x30\x17\x3d\x08\x42\xd8\x0a\xea\x16\xd2\x75\xd8\xc1\x3b\x4a\xb1\xf3\x08\xca\x9d\x06\xa4\xb0\x9f\x02\x10\x7a\x67\x46\x8c\xcb\x3d\xdc\xb4\xd3\xc4\x59\xa1\x74\xd8\xee\xde\x1b\xe9\xfa\x56\xd1\x20\x17\x28\x9d\x3f\xf8\x80\x7d\xab\xdc\x22\x55\x7a\xdd\x75\x06\xf7\x82\xb0\xb8\x72\xbe\x35\x4e\x29\x6d\x55\x3c\x69\xe7\xaf\x5e\x1f\x85\xd1\x9d\x08\x8e\x0a\x5e\x71\x3e\x0a\x8a\xcf\x7f\xe8\x3a\x42\xef\xc1\x07\xd2\x56\xc5\xc6\x66\x67\x65\x52\xa9\xac\xe0\xc8\x59\x24\x45\x82\xdb\x7b\x98\x69\x9b\x67\xdc\x97\x15\x67\x6d\x0b\x92\x50\x04\x04\x8b\x7b\x08\x72\x00\xa3\x7d\x40\x8b\xb4\xe1\xcc\xd8\x1a\x90\xd2\x96\xc5\xd0\x7c\x4b\x9d\xb2\x08\x72\x28\x6a\xc8\x94\x15\x67\x7a\x93\xa6\xfe\xbb\x07\xab\x4d\x24\xcb\x6c\xcd\x17\x11\x84\x31\xb6\x44\xa2\x8a\xb3\xe9\x77\x36\xb5\x7a\x79\x04\x8f\x34\x22\xc1\x5e\x87\x2d\x9c\x5f\x09\x72\x1b\x0d\x66\xb9\x7b\x7b\x0f\x51\x86\x78\xe9\x75\xaa\x94\x9c\xb1\x54\xf9\x6e\x05\x1d\xbe\xda\x80\x24\x71\x08\x2e\x35\x52\xe7\xed\x0c\xd6\x3c\x46\xb0\x34\x79\xde\x66\xf1\x32\x59\x4b\xed\xec\x05\x77\x6a\x26\x88\x0f\xa9\x9b\x8b\xe5\x4b\xb2\xaa\x3e\x21\x65\x53\xff\x08\x93\x15\xff\x0b\xc6\xd9\x8f\xa5\x0d\x74\x28\x67\xed\xaa\x19\x3a\x7d\xe3\x67\xb6\x8a\x50\x45\x0f\x28\xa9\xa6\x65\xca\xba\xc1\x1e\x6d\x98\x1f\x91\x54\x0c\x5b\x4c\x6a\x65\x69\x39\xf3\x1f\x2e\xfa\x31\x69\xf8\x59\x78\x2d\xb3\x14\x57\xf9\x37\xbc\x37\xab\x7c\x85\xe3\x11\x9a\x67\xd1\x23\xfc\x84\x75\xbe\xcc\x34\x65\xcc\x99\xb8\x86\x8b\x70\x44\xf2\x54\x6d\xd2\x4c\x69\x6c\x75\xf7\x8f\xac\x53\x0e\xb3\xb6\x3a\xcc\x61\x6e\x5b\xe8\x70\x23\x76\x26\x9c\xe2\x23\xe6\x30\xde\x81\x1b\xa2\x10\xc2\x98\x03\x78\x0c\x30\x6a\x01\xd2\xf5\xbd\xb0\xdd\xc2\x68\x8b\xb0\x31\x42\x79\xce\xe2\xd1\xac\xd3\xcf\xf2\x2a\xa8\xfc\x3f\x87\xb9\x86\x22\x23\x15\x35\x48\x67\x37\x5a\x35\xeb\xe5\xea\x75\xb9\x7a\x7b\x78\x7a\x5a\x2d\xd7\xeb\x1a\x8a\xa4\xef\x45\x74\x4f\x1b\x55\x86\x7d\x11\xe4\xb1\xac\xf8\xc4\x7f\x05\x00\x00\xff\xff\xde\xb9\x17\xae\xad\x04\x00\x00")
+var _templatesCmdServerMainGoGotmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x94\x54\x41\x6b\xe3\x3c\x10\x3d\x4b\xbf\x62\x3e\x1f\x3e\x6c\x70\xe5\x7b\x4b\x0f\xdd\x36\x0b\x0b\x4b\x29\x09\xdb\x6b\x51\xe5\xb1\x22\x56\x96\xcc\x48\x49\x08\xdd\xfc\xf7\x45\xb2\xda\x98\xb2\x0b\x9b\x8b\x05\x9a\x99\xf7\x46\xef\xbd\x64\x92\xea\xa7\xd4\x08\xa3\x34\x8e\x73\x33\x4e\x9e\x22\xd4\x9c\x55\x83\x95\xba\xe2\xac\x72\x18\xd3\xa1\x4d\xdc\xee\x5e\x85\xf2\x63\xa7\x69\x52\x57\xa8\x7c\x38\x86\x88\x63\xa7\xfd\x55\xbe\x19\x4d\xdf\x5b\x3c\x48\xc2\x4b\xfb\x3b\xeb\xb5\x36\x4e\xa7\x93\x76\xe1\xe2\xf1\xbd\xb4\xa6\x97\xd1\xd3\xa7\xc9\x60\x68\x37\x05\x74\x4b\x5c\xef\xb5\x45\xa1\xbd\x95\x4e\x0b\x4f\x3a\xc3\x57\xbc\xe1\x7c\x2f\x29\x3d\xfc\xae\xef\x09\x43\x80\x10\xc9\x38\x9d\x0a\xc3\xce\xa9\xac\x4f\xdd\xc0\x1b\x67\x69\x59\x24\xb8\xbe\x85\x19\x56\x3c\xe2\xa1\x6e\x38\xeb\x3a\x50\x84\x32\x22\x38\x3c\x40\x54\x13\x58\x13\x22\x3a\xa4\x81\x33\xeb\x5a\x40\xca\x53\x0e\xa3\xf8\x9e\x2b\x75\x15\xd5\x54\xb5\x50\x28\x1b\xce\xcc\x90\xbb\xfe\xbb\x05\x67\x6c\x22\x2b\x6c\xe2\xab\x8c\xd2\x5a\x57\x23\x51\xc3\xd9\xe9\x33\x9b\x5e\x3f\xdd\x43\x40\xda\x23\xc1\xc1\xc4\x2d\x9c\xd5\x01\xb5\x4d\xd6\xb2\x52\xbd\xbe\x85\xf4\xe2\xb4\xf4\x26\xdf\xd4\x9c\xb1\x7c\xf3\xc3\x49\x3a\x7e\x73\x11\x49\xe1\x14\x7d\x2e\xe4\xca\xcb\x19\x4c\xdc\x27\xb0\xdc\x79\x9e\x66\x69\x99\xe2\x81\xf1\x6e\xc1\x9d\x8b\x19\xe2\xc3\x22\xb1\x18\x5e\x92\x35\xed\x3b\x52\x09\xc3\x1f\x61\x8a\xe2\x7f\xc1\x38\xfb\xb1\x72\x91\x8e\xf5\xac\x5d\x33\x43\xe7\x6f\xfa\xcc\x56\x11\xea\xe4\x01\x65\xd5\x8c\x42\x30\xe3\x64\x71\x44\x17\xe7\x47\x64\x15\xe3\x16\xb3\x5a\x45\x5a\xce\xc2\x87\x8b\x61\x9f\x35\xfc\x22\x83\x51\x45\x8a\x8b\xfc\x9b\x5e\xc5\xba\xac\xf0\xf6\x06\xe2\x51\x8e\x08\xbf\x60\x53\x96\x39\x9d\x0a\xe6\x4c\xdc\xc2\x22\x1c\x89\x3c\xdf\x8a\xdc\x53\x5b\xd7\xdc\xfc\x23\xeb\xa9\x84\xd9\x38\x13\xe7\x30\x77\x1d\xf4\x38\xc8\x9d\x8d\xef\xf1\x91\x73\x18\x6f\xc0\x4f\x49\x08\x69\xed\x11\x02\x46\xd8\x1b\x09\xca\x8f\xa3\x74\xfd\x95\x35\x0e\x21\xfd\x41\x04\xce\xd2\x21\x36\xf9\xc7\xf2\x2c\xa9\xfe\xbf\x84\xb9\x85\xaa\x20\x55\x2d\x28\xef\x06\xa3\xc5\x66\xb5\x7e\x5e\xad\x5f\xee\x1e\x1e\xd6\xab\xcd\xa6\x85\x2a\xeb\xbb\x88\xee\xfb\x44\x53\x60\x9f\x24\x05\xac\x1b\x7e\xe2\xbf\x03\x00\x00\xff\xff\xd3\xa1\x88\x0c\xa7\x04\x00\x00")
 
 func templatesCmdServerMainGoGotmplBytes() ([]byte, error) {
 	return bindataRead(
@@ -234,7 +234,7 @@ func templatesCmdServerMainGoGotmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "templates/cmd/server/main.go.gotmpl", size: 1197, mode: os.FileMode(420), modTime: time.Unix(1522341651, 0)}
+	info := bindataFileInfo{name: "templates/cmd/server/main.go.gotmpl", size: 1191, mode: os.FileMode(420), modTime: time.Unix(1523486779, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -254,7 +254,7 @@ func templatesDockerDockerfileApplicationGotmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "templates/docker/Dockerfile.application.gotmpl", size: 91, mode: os.FileMode(420), modTime: time.Unix(1522341651, 0)}
+	info := bindataFileInfo{name: "templates/docker/Dockerfile.application.gotmpl", size: 91, mode: os.FileMode(420), modTime: time.Unix(1523468144, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -274,12 +274,12 @@ func templatesDockerDockerfileGatewayGotmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "templates/docker/Dockerfile.gateway.gotmpl", size: 94, mode: os.FileMode(420), modTime: time.Unix(1522341651, 0)}
+	info := bindataFileInfo{name: "templates/docker/Dockerfile.gateway.gotmpl", size: 94, mode: os.FileMode(420), modTime: time.Unix(1523468144, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
 
-var _templatesProtoServiceProtoGotmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x55\xc1\x6e\xe3\x46\x0c\xbd\xeb\x2b\x58\x9f\x36\x45\x2c\xa1\xed\x2d\x46\x0e\x45\x37\xdb\x2e\x50\x74\x8b\x24\x40\x8f\x05\x35\xa2\xa4\xc1\x8e\x86\xd3\x21\x65\x47\x48\xfd\xef\xc5\xcc\x58\x8e\xbb\x49\xf7\xd0\x8b\x21\x8d\xc8\x47\xce\x7b\xe4\xb3\x2c\x5e\xf1\x09\x6e\x61\x13\x22\x2b\xff\xb0\xd9\x55\x55\x40\xf3\x19\x07\x02\xa1\xb8\xb7\x86\x76\x55\x65\xa7\xc0\x51\x61\x33\x30\x0f\x8e\x9a\x1c\xda\xce\x7d\x43\x53\xd0\xa5\xce\xaf\x9b\xdd\x97\x51\x18\x6c\x83\xde\xb3\xa2\x5a\xf6\xf2\x3a\xcc\xea\x38\xb7\xb5\xe1\xa9\x71\x4b\xaf\x05\xd5\x6c\x07\xf2\xdb\x3d\x3a\xdb\xa1\x52\xf3\xea\xe1\x15\xca\x45\x96\x1c\x70\x18\x28\x36\x1c\x72\xc1\xaf\x17\xff\xe2\x26\x6a\x27\x12\xc5\x29\x9c\x23\xab\x02\x03\x03\xff\xb9\x12\x72\x0b\x9b\xe7\x67\xa8\xef\x99\x15\x8e\xc7\x26\x3d\xff\x86\x13\xa5\xe7\xd0\xee\x42\x9b\xb2\x9a\x06\xee\xcc\xc8\xd7\xf9\xf7\x9e\xfe\x9a\x49\xf4\x1a\xd0\x77\xa7\x03\x09\xec\x85\x60\xc2\xcf\x04\x73\x00\x84\x8d\x28\x46\xa5\xb8\x01\x7a\xc2\x29\x38\x02\x1d\x51\x13\x8e\x28\xfa\x4e\xc0\x7a\x08\x0e\x0d\x41\xcf\x11\x74\x24\xc0\x10\x9c\x35\xf9\x62\xb0\x5e\x00\x3a\xea\xad\xb7\xe5\xb2\xf0\x51\x01\x9d\xe3\x83\xe4\xf8\x1f\xd5\xa1\x24\xc0\x9f\x7e\xfd\x08\xca\x30\x90\xa7\x88\x4a\x80\x1e\xc8\x77\x5b\xe5\x2d\xf9\xee\x5c\x7e\x2d\x23\xa9\x45\x4e\xc8\x13\x7b\xd1\x98\x0b\xd6\xf0\x38\x52\xbe\x4a\x02\x5c\x53\x64\xe4\xd9\x75\xd0\x12\x44\xca\xbd\x76\x70\xb0\x3a\xa6\x02\x17\xcd\x6e\x25\x90\xb1\xbd\x35\x2f\x5d\x8b\x19\x69\xc2\x3a\xd3\xf6\x0b\x45\x02\x8c\x04\xc2\x13\xc1\x48\x2e\xf4\xb3\x83\x48\xc2\x73\x34\x24\xa9\x73\xb4\x1d\x2c\x3c\x27\x4a\x16\x9e\xe3\x0b\x4e\xa6\xf9\x26\xa1\x8c\xaa\x41\x6e\x9a\xe6\x62\xba\xac\xef\xb9\x75\xfc\xc4\x81\x7c\x83\x89\x8c\xad\x61\xaf\x68\x54\xb6\x18\x42\xd3\x3a\x6e\x9b\x09\x45\x29\x96\x81\x68\xd6\xcf\x65\x18\x2e\x61\x3b\xda\x93\xe3\x40\x51\xea\x32\x42\xb9\x42\x19\x42\x76\xdb\x76\xee\x7b\x8a\xd2\x74\x6c\xa4\x79\x95\x7c\xd1\xd3\x10\x83\xd9\x92\x61\x59\x44\xe9\xf4\x3a\xa0\xd2\x01\x97\xff\x5b\x4e\x74\x71\x54\x98\xc4\x10\x96\x33\x39\xbd\xf5\xc3\x37\xf9\xfc\xf1\xd3\xfb\x4f\x37\xf0\x81\xd3\x68\x80\x4d\x9a\xce\x26\x4f\x4c\xe2\xb6\x9d\xad\xeb\x0a\xad\x7c\xf0\x6f\x4b\x54\x00\x1e\x74\x36\x3a\x47\x7a\x09\x9e\x48\x04\x87\xa2\x91\xcc\x56\xcb\x97\x0b\xe9\x6b\xb8\x43\x33\xc2\xda\x38\x24\xb0\xd2\xfc\x9a\x0b\x56\x00\x41\x26\x74\x0e\x1c\x0f\xd6\x60\xd2\xde\x70\xec\xd2\x0c\x26\x09\xe3\x94\xa1\xae\x21\xab\x63\xbd\xf5\x03\x60\x46\x12\x8a\x96\x24\xc5\x79\x9c\x28\xb9\xc7\x4c\x10\xd0\x46\xa9\xab\x15\x3e\x8d\x2c\x3c\x57\x00\xa2\x31\x65\xae\xe7\xb7\xf0\xdd\xae\x3a\x56\xff\x8a\x3b\xad\x6d\x0e\x8f\x14\x08\x95\xca\xfa\x02\x99\x91\xe5\x3f\x72\x4e\x9b\xfd\xd5\xa4\x73\xf9\xe4\x37\x70\x0b\xdf\x67\x9c\x33\xb3\xef\xd3\x12\x53\xde\xbe\xb3\xb9\xfc\x0d\x0f\xc5\x87\xe1\x78\x5c\x2d\x39\xfb\x89\x55\x81\x89\x74\xe4\x4e\x6a\xf8\x40\xe4\xa0\x8f\x44\x09\x4c\x19\xcc\x88\x7e\x28\x48\x89\x93\xc4\xcd\xdb\x88\x49\x79\x52\xa5\xb8\x7d\x11\xce\xe3\x64\xfd\x90\x90\x0c\xfb\x3d\xf9\x93\xab\xdc\xd3\x44\x53\x4b\xb1\x78\xdb\x49\x30\x9b\x0d\xe0\xd2\xba\x56\x37\xa0\x94\x39\xa3\x73\x4b\x16\x69\x20\x85\x48\x13\xef\xa9\xab\xab\xf5\x1e\x6f\xf7\x94\x29\x0c\xa6\x94\x79\x77\xa1\xc8\x15\x44\xd2\x39\x7a\x59\x4f\x0b\xe7\x57\x39\x03\x12\x9a\xed\xa1\xfe\xc3\xea\xf8\x73\xd9\xa5\x64\xcd\x2b\xb9\xbf\x47\xde\xdb\x2e\x59\x6f\x08\xd6\x0f\x92\xee\x7d\x20\xf2\x70\x7f\xf7\xf0\x98\x8c\x30\xb0\xf5\x2a\x99\xdb\xb5\xbf\x95\xdf\x0c\x7f\xfa\x43\x78\x77\xda\x44\x0c\xb6\x4e\x7b\x7a\x05\xb7\xa7\xfa\x00\x81\x45\x6f\x60\xd3\x24\xc9\x37\xa7\xb3\x96\xbb\xe5\x06\x36\xdf\x96\xf7\xe3\xee\xf9\x39\x15\x83\xe3\xb1\x02\x38\x56\xc7\xea\x9f\x00\x00\x00\xff\xff\x80\xb9\xb5\x17\x83\x07\x00\x00")
+var _templatesProtoServiceProtoGotmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x9c\x55\x41\x6f\xe4\x36\x0f\xbd\xfb\x57\xf0\x9b\xd3\xe6\x43\xc6\x46\xdb\x5b\x06\x39\x14\xdd\x6c\xbb\x40\xd1\x2d\x92\x00\x3d\x16\xb4\x4c\xdb\xc2\xca\xa2\x2a\xd2\x33\x19\xa4\xf3\xdf\x0b\xca\xe3\x64\x8a\xa4\x3d\xf4\x32\x90\x25\xf1\x91\x7a\x8f\x7c\x23\xc7\xa8\xf8\x04\xb7\xb0\x49\x99\x95\xbf\xdb\xec\xaa\x2a\xa1\xfb\x8a\x03\x81\x50\xde\x7b\x47\xbb\xaa\xf2\x53\xe2\xac\xb0\x19\x98\x87\x40\x0d\x26\xdf\x60\x8c\xac\xa8\x9e\xa3\xd4\x25\x74\xb3\x7b\xbd\xe6\x75\x9c\xdb\xda\xf1\xd4\x84\x63\xaf\x4d\x39\x77\xdb\x81\xe2\x76\x8f\xc1\x77\xa8\xd4\xbc\x59\xbc\x41\xb9\x88\x92\x03\x0e\x03\xe5\x86\x53\x49\xf8\x6e\xf2\x6a\x39\x84\x81\x7f\x5f\x1f\x70\x0b\x9b\xe7\x67\xa8\xef\x99\x15\x4e\xa7\xc6\xd6\xbf\xe0\x44\xb6\x4e\xed\x2e\xb5\x16\xd5\x34\x70\xe7\x46\xbe\x2e\xbf\xf7\xf4\xc7\x4c\xa2\xd7\x80\xb1\x3b\x6f\x48\xe2\x28\x04\x13\x7e\x25\x98\x13\x20\x6c\x44\x31\x2b\xe5\x0d\xd0\x13\x4e\x29\x10\xe8\x88\x6a\x38\xa2\x18\x3b\x01\x1f\x21\x05\x74\x04\x3d\x67\xd0\x91\x00\x53\x0a\xde\x95\x72\xa1\x54\xdb\xce\x3d\x74\xd4\xfb\xe8\x97\x27\xc0\x67\x05\x0c\x81\x0f\x52\xee\x7f\xaf\x01\xc5\x00\x7f\xf8\xf9\x33\x28\xc3\x40\x91\x32\x2a\x01\x46\xa0\xd8\x6d\x95\xb7\x14\xbb\x97\xf4\x6b\x1a\xb1\x12\xd9\x90\x27\x8e\xa2\xb9\x24\xac\xe1\x71\xa4\xf2\x14\x03\x5c\x43\x64\xe4\x39\x74\xd0\x12\x64\x2a\xb5\x76\x70\xf0\x3a\x5a\x82\x8b\x62\xb7\x92\xc8\xf9\xde\xbb\xd7\xaa\xc5\x8d\x34\x61\x5d\x68\xfb\x89\x32\x01\x66\x02\xe1\x89\x60\xa4\x90\xfa\x39\x40\x26\xe1\x39\x3b\x12\xab\x1c\x7d\x07\x47\x9e\x8d\x92\x23\xcf\xf9\x15\xa7\xd0\x7c\x63\x28\xa3\x6a\x92\x9b\xa6\xb9\xe8\x19\x1f\x7b\x6e\x03\x3f\x71\xa2\xd8\xa0\x91\xb1\x75\x1c\x15\x9d\xca\x16\x53\x6a\xda\xc0\x6d\x33\xa1\x28\xe5\xa5\xb5\x9a\xf5\x78\x69\x86\x4b\xd8\x8e\xf6\x14\x38\x51\x96\x7a\x69\xde\x92\x61\x69\x2d\x0e\xdb\x76\xee\x7b\xca\xd2\x74\xec\xa4\x79\x13\x7c\x51\xd3\x90\x93\xdb\x92\x63\x39\x8a\xd2\xf9\x73\x40\xa5\x03\x1e\xff\x6b\x3a\xd1\x63\xa0\x85\x49\x4c\xe9\xf8\x42\x4e\xef\xe3\xf0\xbf\xb2\xff\xf8\xe5\xe3\x97\x1b\xf8\xc4\xd6\x1a\xe0\x4d\xd3\xd9\x95\x8e\x31\x6e\xdb\xd9\x87\x6e\xa1\x95\x0f\xf1\x7d\x89\x16\x80\x07\x9d\x9d\xce\x99\x5e\x2f\x4f\x24\x82\xc3\xa2\x91\xcc\x5e\x97\x93\x0b\xe9\x6b\xb8\x43\x37\xc2\x5a\x38\x18\xd8\x52\xfc\x1a\x0b\x5e\x00\x41\x26\x0c\x01\x02\x0f\xde\xa1\x69\xef\x38\x77\xd6\x83\x26\x61\x9e\x0a\xd4\x35\x14\x75\x7c\xf4\x71\x00\x2c\x48\x42\xd9\x93\xd8\xbd\x88\x13\x99\x27\xcc\x04\x09\x7d\x96\xba\x5a\xe1\xad\x65\xe1\xb9\x02\x10\xcd\x16\xb9\xee\xdf\xc2\x37\xbb\xea\x54\xfd\xed\xde\x79\x6c\xcb\xf5\x4c\x89\x50\x69\x19\x5f\x20\x37\xb2\xfc\x43\xcc\x79\xb2\xff\x35\xe8\x25\xbd\xfa\xc9\x72\x7f\x5b\x70\x5e\x98\xfd\x68\x43\x4c\x65\xfa\x5e\xcc\xe5\x4f\x78\x58\x7c\x13\x4e\xa7\xd5\x42\x8b\x9f\x78\x15\x98\x48\x47\xee\xa4\x86\x4f\x44\x01\xfa\x4c\x64\x60\xca\xe0\x46\x8c\xc3\x82\x64\x9c\x18\x37\xef\x23\x9a\xf2\xa4\x4a\x79\xfb\x2a\x5c\xc4\xc9\xc7\xc1\x90\x1c\xc7\x3d\xc5\xb3\xab\xdc\xd3\x44\x53\x4b\x79\xf1\xb6\xb3\x60\xbe\x18\xc0\xa5\x75\xad\x6e\x40\x16\x39\x63\x08\xc7\x22\xd2\x40\x0a\x99\x26\xde\x53\x57\x57\xeb\x3b\xde\xaf\xa9\x50\x98\xdc\x92\xe6\xc3\x85\x22\x57\x90\x49\xe7\x1c\x65\xdd\x5d\x38\xbf\x2a\x11\x60\x68\xbe\x87\xfa\x37\xaf\xe3\x8f\xcb\x2c\x99\x35\xaf\xe4\xfe\x9a\x79\xef\x3b\xb3\xde\x94\x7c\x1c\xc4\xde\x7d\x20\x8a\x70\x7f\xf7\xf0\x68\x46\x98\xd8\x47\x95\xc2\xed\x5a\xdf\xca\x6f\x81\x3f\xff\x21\x7c\x38\x4f\x22\x26\x5f\xdb\x9c\x5e\xc1\xed\x39\x3f\x40\x62\xd1\x1b\xd8\x34\x26\xf9\xe6\xbc\xd7\x72\x77\xbc\x81\xcd\xff\x97\xef\xd3\xee\xf9\xd9\x92\xc1\xe9\x54\x01\x9c\xaa\x53\xf5\x57\x00\x00\x00\xff\xff\x81\xf4\x51\x98\x33\x07\x00\x00")
 
 func templatesProtoServiceProtoGotmplBytes() ([]byte, error) {
 	return bindataRead(
@@ -294,12 +294,12 @@ func templatesProtoServiceProtoGotmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "templates/proto/service.proto.gotmpl", size: 1923, mode: os.FileMode(420), modTime: time.Unix(1522342599, 0)}
+	info := bindataFileInfo{name: "templates/proto/service.proto.gotmpl", size: 1843, mode: os.FileMode(420), modTime: time.Unix(1523487205, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
 
-var _templatesSvcZserverGoGotmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x74\x92\xcf\x6b\xdb\x4e\x10\xc5\xcf\xd6\x5f\xf1\xbe\x86\x6f\x90\x8a\xd8\xdc\x03\xb9\x34\x2d\xa5\x87\x3a\x10\xf7\x56\x4a\x59\xaf\x46\xd6\x12\x69\x77\x3d\x3b\xf2\x0f\x54\xfd\xef\x65\x25\x3b\x36\xa1\x3d\x19\xcf\xbc\xfd\xbc\x37\xa3\x09\xda\xbc\xea\x2d\x21\xee\x4d\x96\xd5\xbd\x33\x58\xd1\xe1\xa3\x8e\xd6\xac\x89\xf7\xc4\x79\x81\x3c\x6c\xd4\x30\x40\xad\x74\x47\xf8\x8d\x54\xb7\x86\x30\x8e\xb3\xa2\x04\x31\x7b\x2e\x30\x64\x0b\x26\xe9\xd9\xe1\x8e\x4c\xe3\xe7\xee\x30\x96\x70\xb6\xcd\xc6\x2c\xbb\xbf\xc7\xf7\xe7\x4f\xcf\x0f\x78\xf2\x1d\xa1\x0f\x38\x58\x69\x70\xf2\x3d\xc3\x1f\x1c\x6c\x17\x5a\xea\xc8\x89\x16\xeb\x1d\x7c\x0d\x69\x08\x7f\x35\x4e\xa8\x38\xff\x53\xf8\x6c\x1a\x0f\xed\x2a\x5c\x4d\xd1\xe9\xd7\xc9\x21\x4e\xd0\x7f\xa0\x97\x51\x34\x0b\xf1\x12\x89\x47\x47\x3d\x6b\xdd\x1b\x3a\xb0\x17\xaf\xf0\x55\x60\x23\x6a\xcf\xa8\xa8\xf3\x2e\x0a\xcf\x98\xd0\x73\xf0\x91\x22\xbc\x6b\x4f\x53\x82\xd8\xf8\xbe\xad\x26\xda\x9e\x9c\xf4\xba\x6d\x4f\xd8\x10\x98\x3a\xbf\xa7\x4a\x65\x72\x0a\x74\x9b\x33\x0a\xf7\x46\x86\xdb\xe5\xbc\x50\x68\xb5\xa1\x79\xac\x69\x43\x29\xab\x0e\xa1\xb5\x66\xf6\x3d\xc7\x43\x45\xb5\x75\x36\x95\x22\xa4\xd1\x82\x46\xef\x09\x1b\x22\x97\x68\x53\x97\x2a\x58\x17\x6d\x45\xef\x66\x9a\xbf\x74\x7e\x4d\x52\x4c\x7e\xb9\x91\x23\x8c\x77\x42\x47\x51\x4f\xf3\x6f\x09\xa6\x1d\x3e\x84\x8d\x4a\x8a\x17\xda\xf5\x14\xa5\x40\x7e\xad\xc4\xe0\x5d\xa4\xdb\x33\x48\xdc\x88\x87\x47\xfc\xf8\x79\x91\x0d\x63\xb6\x48\x2b\xfc\x55\x82\x52\x87\xb5\xdb\xa6\xc5\xec\xd4\x17\x92\x24\x88\xf9\xf4\x74\xc1\x67\x5e\x12\xd5\x9d\xa8\x75\x60\xeb\xa4\xce\x97\x49\x64\xdd\x16\xff\x47\xd4\xec\xbb\x69\x22\xe2\xff\x96\x25\x48\x7d\xa3\x18\xf5\x96\x8a\x6c\x71\xf6\x7e\x4c\x1b\x23\x57\x4d\x23\xc6\x12\x77\x97\x18\x17\xfc\x58\x64\x8b\xf1\x7a\xb0\xef\x86\x19\xce\xcf\xc4\x76\xa4\x56\xfe\x90\x17\x6a\x2d\x6c\xdd\x36\x2f\xde\xee\xf9\x4f\x00\x00\x00\xff\xff\x57\xb9\xc6\x80\x3a\x03\x00\x00")
+var _templatesSvcZserverGoGotmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x74\x93\xcf\x6b\xdb\x4e\x10\xc5\xcf\xda\xbf\xe2\x7d\x05\xdf\x20\x15\xa3\xdc\x03\xb9\x34\x2d\xa5\x87\x26\x90\xf4\x56\x4a\x59\xaf\x46\xd6\x12\xed\x8f\xcc\x8e\xec\x18\x55\xff\x7b\x59\xc9\x89\x43\x68\x4f\x8b\x77\xde\x7e\xde\x9b\xf1\x28\x6a\xf3\xa8\x77\x84\xb4\x37\x4a\x59\x17\x03\x0b\x2a\x55\x94\x26\x78\xa1\x67\x29\x55\x51\x76\x6e\x39\xc4\x3a\x2a\x55\xad\x54\x37\x7a\x83\x5b\x3a\x7c\xd4\xc9\x9a\x07\xe2\x3d\x71\x55\xa3\x8a\xdb\x66\x9a\xd0\xdc\x6a\x47\xf8\x8d\x7c\x6f\x0d\x61\x9e\x57\xc5\x06\xc4\x1c\xb8\xc6\xa4\x0a\x26\x19\xd9\xe3\x82\x4c\x1f\xd6\xea\x34\x6f\xe0\xed\xa0\x66\xa5\x2e\x2f\xf1\xfd\xee\xd3\xdd\x15\x6e\x82\x23\x8c\x11\x07\x2b\x3d\x8e\x61\x64\x84\x83\x87\x75\x71\x20\x47\x5e\xb4\xd8\xe0\x11\x3a\x48\x4f\xf8\xab\x71\x46\xa5\xf5\x57\x83\xcf\xa6\x0f\xd0\xbe\xc5\xd9\x14\x4e\x3f\x2e\x0e\x69\x81\xfe\x03\x5d\x26\xd1\x2c\xc4\x25\x32\x8f\x9e\xf5\xaa\xf5\xaf\xe8\xc8\x41\x42\x83\xaf\x02\x9b\xd0\x05\x46\x4b\x2e\xf8\x24\xbc\x62\xe2\xc8\x31\x24\x4a\x08\x7e\x38\x2e\x09\x52\x1f\xc6\xa1\x5d\x68\x7b\xf2\x32\xea\x61\x38\x62\x4b\x60\x72\x61\x4f\x6d\xa3\xe4\x18\xe9\x6d\xce\x24\x3c\x1a\x99\xde\x0e\xe7\x9e\xe2\xa0\x0d\xad\x6d\x2d\x13\xca\x59\x75\x8c\x83\x35\xab\xef\x29\x1e\x5a\xea\xac\xb7\xf9\x2a\x41\x7a\x2d\xe8\xf5\x9e\xb0\x25\xf2\x99\xb6\x54\xa9\x85\xf5\xc9\xb6\xf4\xae\xa7\xf5\x9f\xae\xce\x49\xea\xc5\xaf\x32\xf2\x8c\xd3\x7e\x34\x37\xeb\xb9\x01\xd3\x13\x3e\xc4\x6d\x93\x15\xf7\xf4\x34\x52\x92\x1a\xd5\xf9\x26\xc5\xe0\x13\xbd\x5d\x83\xcc\x4d\xb8\xba\xc6\x8f\x9f\x2f\xb2\x69\x56\x45\x1e\xe1\xaf\x0d\x28\x57\x58\xfb\x5d\x1e\xcc\x53\xf3\x85\x24\x0b\x52\xb5\x3c\x2d\xf8\xc4\xcb\xa2\xce\x49\xf3\x10\xd9\x7a\xe9\xaa\x32\x8b\xac\xdf\xe1\xff\x84\x8e\x83\x5b\x3a\x22\xfe\xaf\xdc\x80\x9a\x6f\x94\x92\xde\x51\xad\x8a\x93\xf7\x75\x9e\x18\xf9\x76\x69\x31\x6d\x70\xf1\x12\xe3\x05\x3f\xd7\xaa\x98\xcf\x0b\xfb\xae\x99\xe9\xf4\x2c\x7f\x19\xcd\x6d\x38\x54\x75\xf3\x20\x6c\xfd\xae\xaa\x5f\xf7\xf9\x4f\x00\x00\x00\xff\xff\x6a\xcb\x86\x80\x60\x03\x00\x00")
 
 func templatesSvcZserverGoGotmplBytes() ([]byte, error) {
 	return bindataRead(
@@ -314,7 +314,7 @@ func templatesSvcZserverGoGotmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "templates/svc/zserver.go.gotmpl", size: 826, mode: os.FileMode(420), modTime: time.Unix(1522341651, 0)}
+	info := bindataFileInfo{name: "templates/svc/zserver.go.gotmpl", size: 864, mode: os.FileMode(420), modTime: time.Unix(1523486788, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
diff --git a/cli/atlas/templates/Makefile.gotmpl b/cli/atlas/templates/Makefile.gotmpl
index 689fdc8d..28a9fe57 100644
--- a/cli/atlas/templates/Makefile.gotmpl
+++ b/cli/atlas/templates/Makefile.gotmpl
@@ -1,4 +1,4 @@
-PROJECT_ROOT 				:= {{ .Root }}/{{ .Name }}
+PROJECT_ROOT 				:= {{ if .Root }}{{ .Root }}/{{ .Name }}{{ else }}{{ .Name }}{{ end }}
 BUILD_PATH  				:= bin
 DOCKERFILE_PATH 		:= $(CURDIR)/docker
 
diff --git a/cli/atlas/templates/cmd/gateway/handler.go.gotmpl b/cli/atlas/templates/cmd/gateway/handler.go.gotmpl
index 7f4a2402..9c8eeea9 100644
--- a/cli/atlas/templates/cmd/gateway/handler.go.gotmpl
+++ b/cli/atlas/templates/cmd/gateway/handler.go.gotmpl
@@ -1,5 +1,12 @@
 package main
 
+import (
+	"context"
+	"net/http"
+	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"google.golang.org/grpc"
+)
+
 // New{{ .Name | Service}}Handler returns an HTTP handler that serves the gRPC gateway
 func New{{ .Name | Service }}Handler(ctx context.Context, grpcAddr string, opts ...runtime.ServeMuxOption) (http.Handler, error) {
 	mux := runtime.NewServeMux(opts...)
diff --git a/cli/atlas/templates/cmd/gateway/main.go.gotmpl b/cli/atlas/templates/cmd/gateway/main.go.gotmpl
index 99a6a25c..312568d9 100644
--- a/cli/atlas/templates/cmd/gateway/main.go.gotmpl
+++ b/cli/atlas/templates/cmd/gateway/main.go.gotmpl
@@ -1,5 +1,14 @@
 package main
 
+import (
+	"context"
+	"flag"
+	"log"
+	"net/http"
+	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"github.com/infobloxopen/atlas-app-toolkit/gw"
+)
+
 var (
 	ServerAddr  string
 	GatewayAddr string
diff --git a/cli/atlas/templates/cmd/gateway/swagger.go.gotmpl b/cli/atlas/templates/cmd/gateway/swagger.go.gotmpl
index e2500350..4e4f0468 100644
--- a/cli/atlas/templates/cmd/gateway/swagger.go.gotmpl
+++ b/cli/atlas/templates/cmd/gateway/swagger.go.gotmpl
@@ -1,5 +1,12 @@
 package main
 
+import (
+	"log"
+	"net/http"
+	"path/filepath"
+	"strings"
+)
+
 // SwaggerHandler returns an HTTP handler that serves the swagger spec
 func SwaggerHandler(rw http.ResponseWriter, req *http.Request) {
 	p := strings.TrimPrefix(req.URL.Path, "/swagger/")
diff --git a/cli/atlas/templates/cmd/server/main.go.gotmpl b/cli/atlas/templates/cmd/server/main.go.gotmpl
index cf980b77..b6393baa 100644
--- a/cli/atlas/templates/cmd/server/main.go.gotmpl
+++ b/cli/atlas/templates/cmd/server/main.go.gotmpl
@@ -1,10 +1,13 @@
 package main
 
 import (
-	{{/* these imports are hard-coded because goimports can't resolve them */}}
+	"flag"
+	"net"
 	"github.com/grpc-ecosystem/go-grpc-middleware"
 	"github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus"
 	"github.com/grpc-ecosystem/go-grpc-middleware/validator"
+	"github.com/sirupsen/logrus"
+	"google.golang.org/grpc"
 )
 
 var (
diff --git a/cli/atlas/templates/proto/service.proto.gotmpl b/cli/atlas/templates/proto/service.proto.gotmpl
index 48371817..22b3a8e7 100644
--- a/cli/atlas/templates/proto/service.proto.gotmpl
+++ b/cli/atlas/templates/proto/service.proto.gotmpl
@@ -2,11 +2,9 @@ syntax = "proto3";
 
 package service;
 
-import "google/protobuf/empty.proto";
 import "google/api/annotations.proto";
 import "github.com/lyft/protoc-gen-validate/validate/validate.proto";
 import "protoc-gen-swagger/options/annotations.proto";
-import "google/protobuf/timestamp.proto";
 
 option go_package = "{{ .Root }}/{{ .Name }}/pb;pb";
 
diff --git a/cli/atlas/templates/svc/zserver.go.gotmpl b/cli/atlas/templates/svc/zserver.go.gotmpl
index 540f128d..48080725 100644
--- a/cli/atlas/templates/svc/zserver.go.gotmpl
+++ b/cli/atlas/templates/svc/zserver.go.gotmpl
@@ -1,5 +1,11 @@
 package svc
 
+import (
+	"context"
+	"fmt"
+	"time"
+)
+
 func NewBasicServer() (pb.{{ .Name | Service }}Server, error) {
 	return &echoServer{}, nil
 }