diff --git a/proxy/infra/infra_service.go b/proxy/infra/infra_service.go
index 08a1890..8c9b4d7 100644
--- a/proxy/infra/infra_service.go
+++ b/proxy/infra/infra_service.go
@@ -79,90 +79,89 @@ func NewInfraService() *InfraService {
 	return &InfraService{}
 }
 
-func(is *InfraService) Save(infra *Infra) (string, error) {
+func (is *InfraService) Save(infra *Infra) (string, error) {
 	out, err := utils.InvokeDBByModel("infra", "save", infra, "com.loafle.overflow.module.infra.model.Infra")
 
 	if err != nil {
 		return "", err
 	}
 
-	return out, nil;
+	return out, nil
 }
 
-
-func(is *InfraService) SaveMachine(i *InfraMachine) (string, error) {
+func (is *InfraService) SaveMachine(i *InfraMachine) (string, error) {
 	out, err := utils.InvokeDBByModel("infraMachine", "save", i, "com.loafle.overflow.module.infra.model.InfraMachine")
 
 	if err != nil {
 		return "", err
 	}
 
-	return out, nil;
+	return out, nil
 }
 
-func(is *InfraService) SaveHost(i *InfraHost) (string, error) {
+func (is *InfraService) SaveHost(i *InfraHost) (string, error) {
 	out, err := utils.InvokeDBByModel("infraHost", "save", i, "com.loafle.overflow.module.infra.model.InfraHost")
 
 	if err != nil {
 		return "", err
 	}
 
-	return out, nil;
+	return out, nil
 }
 
-func(is *InfraService) SaveOS(i *InfraOS) (string, error) {
+func (is *InfraService) SaveOS(i *InfraOS) (string, error) {
 	out, err := utils.InvokeDBByModel("InfraOS", "save", i, "com.loafle.overflow.module.infra.model.InfraOS")
 
 	if err != nil {
 		return "", err
 	}
 
-	return out, nil;
+	return out, nil
 }
 
-func(is *InfraService) SaveOSApplication(i *InfraOSApplication) (string, error) {
+func (is *InfraService) SaveOSApplication(i *InfraOSApplication) (string, error) {
 	out, err := utils.InvokeDBByModel("InfraOSApplication", "save", i, "com.loafle.overflow.module.infra.model.InfraOSApplication")
 
 	if err != nil {
 		return "", err
 	}
 
-	return out, nil;
+	return out, nil
 }
 
-func(is *InfraService) SaveOSDaemon(i *InfraOSDaemon) (string, error) {
+func (is *InfraService) SaveOSDaemon(i *InfraOSDaemon) (string, error) {
 	out, err := utils.InvokeDBByModel("InfraOSDaemon", "save", i, "com.loafle.overflow.module.infra.model.InfraOSDaemon")
 
 	if err != nil {
 		return "", err
 	}
 
-	return out, nil;
+	return out, nil
 }
 
-func(is *InfraService) SaveOSPort(i *InfraOSPort) (string, error) {
+func (is *InfraService) SaveOSPort(i *InfraOSPort) (string, error) {
 	out, err := utils.InvokeDBByModel("InfraOSPort", "save", i, "com.loafle.overflow.module.infra.model.InfraOSPort")
 
 	if err != nil {
 		return "", err
 	}
 
-	return out, nil;
+	return out, nil
 }
 
-func(is *InfraService) SaveService(i *InfraService) (string, error) {
+func (is *InfraService) SaveService(i *InfraService) (string, error) {
 	out, err := utils.InvokeDBByModel("InfraService", "save", i, "com.loafle.overflow.module.infra.model.InfraService")
 
 	if err != nil {
 		return "", err
 	}
 
-	return out, nil;
+	return out, nil
 }
 
-func (is *InfraService)Read(id string) (string, error){
+func (is *InfraService) Read(id string) (string, error) {
 
-	out,err :=utils.InvokeDBByModel("infra","findOne",id,"java.lang.Long")
+	out, err := utils.InvokeDBByModel("infra", "findOne", id, "java.lang.Long")
 
 	if err != nil {
 		return "", err
@@ -171,13 +170,13 @@ func (is *InfraService)Read(id string) (string, error){
 	return out, nil
 }
 
-func (is *InfraService)ReadChild(infraType, id string) (string, error){
+func (is *InfraService) ReadChild(infraType, id string) (string, error) {
 
-	out,err :=utils.InvokeDBByModel(infraType,"findOne",id,"java.lang.Long")
+	out, err := utils.InvokeDBByModel(infraType, "findOne", id, "java.lang.Long")
 
 	if err != nil {
 		return "", err
 	}
 
 	return out, nil
-}
\ No newline at end of file
+}
diff --git a/proxy/utils/model_mapping.go b/proxy/utils/model_mapping.go
index 142de80..537bc31 100644
--- a/proxy/utils/model_mapping.go
+++ b/proxy/utils/model_mapping.go
@@ -1,10 +1,19 @@
 package utils
 
-
 const (
-	MODEL_DOMAIN = "com.loafle.overflow.module.domain.model.Domain"
-	MODEL_NOAUTHPROBE = "com.loafle.overflow.module.noauthprobe.model.NoAuthProbe"
-	MODEL_PROBE = "com.loafle.overflow.module.probe.model.Probe"
+	MODEL_DOMAIN               = "com.loafle.overflow.module.domain.model.Domain"
+	MODEL_NOAUTHPROBE          = "com.loafle.overflow.module.noauthprobe.model.NoAuthProbe"
+	MODEL_PROBE                = "com.loafle.overflow.module.probe.model.Probe"
+	MODEL_INFRA                = "com.loafle.overflow.module.infra.model.Infra"
+	MODEL_INFRA_MACHINE        = "com.loafle.overflow.module.infra.model.InfraMachine"
+	MODEL_INFRA_HOST           = "com.loafle.overflow.module.infra.model.InfraHost"
+	MODEL_INFRA_OS             = "com.loafle.overflow.module.infra.model.InfraOS"
+	MODEL_INFRA_OS_APPLICATION = "com.loafle.overflow.module.infra.model.InfraOSApplication"
+	MODEL_INFRA_OS_DAEMON      = "com.loafle.overflow.module.infra.model.InfraOSDaemon"
+	MODEL_INFRA_OS_PORT        = "com.loafle.overflow.module.infra.model.InfraOSPort"
+	MODEL_INFRA_SERVICE        = "com.loafle.overflow.module.infra.model.InfraService"
+	MODEL_TARGET               = "com.loafle.overflow.module.target.model.Target"
+
 	MODEL_STRING = "java.lang.String"
-	MODEL_LONG = "java.lang.Long"
-)
\ No newline at end of file
+	MODEL_LONG   = "java.lang.Long"
+)