diff --git a/pom.xml b/pom.xml
index b5e092a..cae24a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,12 +24,13 @@
         <caffeine.version>2.5.6</caffeine.version>
         <protoc.version>3.5.1</protoc.version>
         <spring.version>5.0.6.RELEASE</spring.version>
+        <spring.data.commons.version>2.0.7.RELEASE</spring.data.commons.version>
         <spring.data.jpa.version>2.0.7.RELEASE</spring.data.jpa.version>
         <spring.data.redis.version>2.0.7.RELEASE</spring.data.redis.version>
         <spring.crypto.version>5.0.5.RELEASE</spring.crypto.version>
         <!-- <gson.version>2.8.2</gson.version> -->
         <jackson.mapper.version>1.9.13</jackson.mapper.version>
-        <hibernate.version>5.2.10.Final</hibernate.version>
+        <hibernate.version>5.3.1.Final</hibernate.version>
         <javax.mail.version>1.4.7</javax.mail.version>
         <javax.mail-api.version>1.6.0</javax.mail-api.version>
         <apache.velocity.version>1.7</apache.velocity.version>
@@ -49,7 +50,7 @@
         <dependency>
             <groupId>com.loafle.overflow</groupId>
             <artifactId>commons-java</artifactId>
-            <version>1.0.9-SNAPSHOT</version>
+            <version>1.0.13-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -81,6 +82,13 @@
         </dependency>
 
         <!-- Spring Dependency-->
+
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-commons</artifactId>
+            <version>${spring.data.jpa.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-jpa</artifactId>
diff --git a/src/main/java/com/loafle/overflow/central/module/domain/dao/DomainMemberDAO.java b/src/main/java/com/loafle/overflow/central/module/domain/dao/DomainMemberDAO.java
index e5a56d6..481bcd9 100644
--- a/src/main/java/com/loafle/overflow/central/module/domain/dao/DomainMemberDAO.java
+++ b/src/main/java/com/loafle/overflow/central/module/domain/dao/DomainMemberDAO.java
@@ -4,6 +4,8 @@ import com.loafle.overflow.model.domain.Domain;
 import com.loafle.overflow.model.domain.DomainMember;
 import com.loafle.overflow.model.member.Member;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -16,7 +18,9 @@ public interface DomainMemberDAO extends JpaRepository<DomainMember, Long> {
 
   DomainMember findByMemberEmail(String memberEmail);
 
-  Domain findDomainByMemberId(Long memberId);
+  @Query("SELECT dm.domain from DomainMember dm where dm.member.email = :memberEmail")
+  Domain findDomainByMemberEmail(@Param("memberEmail") String memberEmail);
 
-  List<Member> findAllMemberByDomainId(Long domainID);
+  @Query("SELECT dm.member from DomainMember dm where dm.domain.id = :domainId")
+  List<Member> findAllMemberByDomainId(@Param("domainId") Long domainId);
 }
diff --git a/src/main/java/com/loafle/overflow/central/module/domain/service/CentralDomainMemberService.java b/src/main/java/com/loafle/overflow/central/module/domain/service/CentralDomainMemberService.java
index ddd031e..dfb1bd7 100644
--- a/src/main/java/com/loafle/overflow/central/module/domain/service/CentralDomainMemberService.java
+++ b/src/main/java/com/loafle/overflow/central/module/domain/service/CentralDomainMemberService.java
@@ -24,8 +24,8 @@ public class CentralDomainMemberService implements DomainMemberService {
     this.domainMemberDAO.save(domainMember);
   }
 
-  public Domain readDomainByMemberID(Long memberID) {
-    return this.domainMemberDAO.findDomainByMemberId(memberID);
+  public Domain readDomainByMemberEmail(String memberEmail) {
+    return this.domainMemberDAO.findDomainByMemberEmail(memberEmail);
   }
 
   public DomainMember readByMemberEmail(String email) {
diff --git a/src/main/java/com/loafle/overflow/central/module/email/service/EmailAuthService.java b/src/main/java/com/loafle/overflow/central/module/email/service/EmailAuthService.java
index dd78dde..caf5567 100644
--- a/src/main/java/com/loafle/overflow/central/module/email/service/EmailAuthService.java
+++ b/src/main/java/com/loafle/overflow/central/module/email/service/EmailAuthService.java
@@ -48,7 +48,7 @@ public class EmailAuthService {
   // "http://127.0.0.1:4200/auth/";
 
   public EmailAuth read(Long id) {
-    return this.emailAuthDAO.findOne(id);
+    return this.emailAuthDAO.findById(id).get();
   }
 
   public EmailAuth readBySignupAuthKey(String token) throws OverflowException {
diff --git a/src/main/java/com/loafle/overflow/central/module/infra/dao/InfraDAO.java b/src/main/java/com/loafle/overflow/central/module/infra/dao/InfraDAO.java
index b947efe..6b1899e 100644
--- a/src/main/java/com/loafle/overflow/central/module/infra/dao/InfraDAO.java
+++ b/src/main/java/com/loafle/overflow/central/module/infra/dao/InfraDAO.java
@@ -19,10 +19,10 @@ public interface InfraDAO extends JpaRepository<Infra, Long> {
 
     Page<Infra> findAllByProbeId(Long probeID, Pageable pageable);
 
-    Page<Infra> findAllByProbeInAndTargetNotNull(List<Probe> probes, Pageable pageable);
+    Page<Infra> findAllByProbeIn(List<Probe> probes, Pageable pageable);
 
     List<Target> findAllTargetByProbeIn(List<Probe> probes);
 
-    Infra findByTargetId(Long targetID);
+    // Infra findByTargetId(Long targetID);
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/loafle/overflow/central/module/infra/dao/InfraOSPortDAO.java b/src/main/java/com/loafle/overflow/central/module/infra/dao/InfraOSPortDAO.java
index db1b351..38c24b9 100644
--- a/src/main/java/com/loafle/overflow/central/module/infra/dao/InfraOSPortDAO.java
+++ b/src/main/java/com/loafle/overflow/central/module/infra/dao/InfraOSPortDAO.java
@@ -9,5 +9,5 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface InfraOSPortDAO extends JpaRepository<InfraOSPort, Long> {
-    InfraOSPort findByInfraOSIdAndPortAndPortType(Long infraOSId, Integer port, String portType);
+    InfraOSPort findByInfraOSAndPortAndPortType(Long infraOSId, Integer port, String portType);
 }
\ No newline at end of file
diff --git a/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraHostService.java b/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraHostService.java
index 818c2bd..ee38c48 100644
--- a/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraHostService.java
+++ b/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraHostService.java
@@ -22,7 +22,7 @@ public class CentralInfraHostService implements InfraHostService {
     }
 
     public InfraHost read(Long id) throws OverflowException  {
-        return this.infraHostDAO.findOne(id);
+        return this.infraHostDAO.findById(id).get();
     }
 
     public InfraHost readByProbeIdAndIpv4(Long probeId, String ip) throws OverflowException  {
diff --git a/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraMachineService.java b/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraMachineService.java
index 009d851..e230a1f 100644
--- a/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraMachineService.java
+++ b/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraMachineService.java
@@ -20,6 +20,6 @@ public class CentralInfraMachineService implements InfraMachineService {
     }
 
     public InfraMachine read(Long id) {
-        return this.infraMachineDAO.findOne(id);
+        return this.infraMachineDAO.findById(id).get();
     }
 }
diff --git a/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraOSApplicationService.java b/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraOSApplicationService.java
index b36e248..0d2f3ad 100644
--- a/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraOSApplicationService.java
+++ b/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraOSApplicationService.java
@@ -21,6 +21,6 @@ public class CentralInfraOSApplicationService implements InfraOSApplicationServi
     }
 
     public InfraOSApplication read(Long id) throws OverflowException {
-        return this.infraOSApplicationDAO.findOne(id);
+        return this.infraOSApplicationDAO.findById(id).get();
     }
 }
diff --git a/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraOSDaemonService.java b/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraOSDaemonService.java
index 04f924f..018b533 100644
--- a/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraOSDaemonService.java
+++ b/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraOSDaemonService.java
@@ -21,6 +21,6 @@ public class CentralInfraOSDaemonService implements InfraOSDaemonService {
     }
 
     public InfraOSDaemon read(Long id) throws OverflowException {
-        return this.infraOSDaemonDAO.findOne(id);
+        return this.infraOSDaemonDAO.findById(id).get();
     }
 }
diff --git a/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraOSPortService.java b/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraOSPortService.java
index bd74bbf..e623dbe 100644
--- a/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraOSPortService.java
+++ b/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraOSPortService.java
@@ -21,11 +21,11 @@ public class CentralInfraOSPortService implements InfraOSPortService {
     }
 
     public InfraOSPort read(Long id) throws OverflowException {
-        return this.infraOSPortDAO.findOne(id);
+        return this.infraOSPortDAO.findById(id).get();
     }
 
     public InfraOSPort readByInfraOSIDAndPortAndPortType(Long infraOSID, Integer port, String portType)
             throws OverflowException {
-        return this.infraOSPortDAO.findByInfraOSIdAndPortAndPortType(infraOSID, port, portType);
+        return this.infraOSPortDAO.findByInfraOSAndPortAndPortType(infraOSID, port, portType);
     }
 }
diff --git a/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraOSService.java b/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraOSService.java
index 613f95c..d19a078 100644
--- a/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraOSService.java
+++ b/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraOSService.java
@@ -21,6 +21,6 @@ public class CentralInfraOSService implements InfraOSService {
     }
 
     public InfraOS read(Long id) throws OverflowException {
-        return this.infraOSDAO.findOne(id);
+        return this.infraOSDAO.findById(id).get();
     }
 }
diff --git a/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraService.java b/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraService.java
index 80a555e..e335c24 100644
--- a/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraService.java
+++ b/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraService.java
@@ -38,7 +38,7 @@ public class CentralInfraService implements InfraService {
     }
 
     public Infra read(Long id) throws OverflowException {
-        Infra infra = this.infraDAO.findOne(id);
+        Infra infra = this.infraDAO.findById(id).get();
         return infra;
     }
 
@@ -53,7 +53,7 @@ public class CentralInfraService implements InfraService {
             throw new OverflowException("ProbeNotFoundException", new Throwable());
         }
 
-        Page<Infra> infraList = this.infraDAO.findAllByProbeInAndTargetNotNull(probeList, PageUtil.getPageRequest(pageParams));
+        Page<Infra> infraList = this.infraDAO.findAllByProbeIn(probeList, PageUtil.getPageRequest(pageParams));
         return infraList;
     }
 
@@ -74,7 +74,8 @@ public class CentralInfraService implements InfraService {
     }
 
     public Infra readByTargetID(Long targetID) throws OverflowException {
-        return this.infraDAO.findByTargetId(targetID);
+        // return this.infraDAO.findByTargetId(targetID);
+        return null;
     }
 
 }
diff --git a/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraServiceService.java b/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraServiceService.java
index 895758c..6abc79b 100644
--- a/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraServiceService.java
+++ b/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraServiceService.java
@@ -21,7 +21,7 @@ public class CentralInfraServiceService implements InfraServiceService {
     }
 
     public InfraService read(Long id) throws OverflowException {
-        return this.infraServiceDAO.findOne(id);
+        return this.infraServiceDAO.findById(id).get();
     }
 
     public InfraService readByInfraHostIDAndPortAndPortType(Long infraHostID, int port, String portType)
diff --git a/src/main/java/com/loafle/overflow/central/module/member/service/CentralMemberService.java b/src/main/java/com/loafle/overflow/central/module/member/service/CentralMemberService.java
index 4230a23..87f9639 100644
--- a/src/main/java/com/loafle/overflow/central/module/member/service/CentralMemberService.java
+++ b/src/main/java/com/loafle/overflow/central/module/member/service/CentralMemberService.java
@@ -245,7 +245,7 @@ public class CentralMemberService implements MemberService {
             throw new OverflowException("SignInIdNotExistException()", new Throwable());
         }
 
-        Member resMember = this.memberDAO.findOne(memberId);
+        Member resMember = this.memberDAO.findById(memberId).get();
         return resMember;
     }
 
diff --git a/src/main/java/com/loafle/overflow/central/module/member/service/CentralMemberTotpService.java b/src/main/java/com/loafle/overflow/central/module/member/service/CentralMemberTotpService.java
index 342edf7..179e96b 100644
--- a/src/main/java/com/loafle/overflow/central/module/member/service/CentralMemberTotpService.java
+++ b/src/main/java/com/loafle/overflow/central/module/member/service/CentralMemberTotpService.java
@@ -51,11 +51,11 @@ public class CentralMemberTotpService implements MemberTotpService {
     }
 
     public void remove(Long id) throws OverflowException {
-        this.totpDAO.delete(id);
+        this.totpDAO.deleteById(id);
     }
 
     public MemberTotp read(Long id) throws OverflowException {
-        return this.totpDAO.findOne(id);
+        return this.totpDAO.findById(id).get();
     }
 
     public boolean checkCodeForMember(String memberEmail, String code) throws OverflowException {
diff --git a/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorDisplayMappingDAO.java b/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorDisplayMappingDAO.java
index 73d9834..ead747f 100644
--- a/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorDisplayMappingDAO.java
+++ b/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorDisplayMappingDAO.java
@@ -3,6 +3,8 @@ package com.loafle.overflow.central.module.meta.dao;
 import com.loafle.overflow.model.meta.MetaSensorDisplayMapping;
 import com.loafle.overflow.model.meta.MetaSensorItemKey;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -12,5 +14,7 @@ import java.util.List;
  */
 @Repository
 public interface MetaSensorDisplayMappingDAO extends JpaRepository<MetaSensorDisplayMapping, Short> {
-    public List<MetaSensorItemKey> findAllMetaSensorItemKeyByMetaSensorDisplayItemId(Long metaSensorDisplayItemId);
+
+    @Query("SELECT m.metaSensorItemKey from MetaSensorDisplayMapping m where m.metaSensorDisplayItem.id = :metaSensorDisplayItemId")
+    public List<MetaSensorItemKey> findAllMetaSensorItemKeyByMetaSensorDisplayItemId(@Param("metaSensorDisplayItemId") Long metaSensorDisplayItemId);
 }
diff --git a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaHistoryTypeService.java b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaHistoryTypeService.java
index 799eb5a..bde2393 100644
--- a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaHistoryTypeService.java
+++ b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaHistoryTypeService.java
@@ -28,6 +28,6 @@ public class CentralMetaHistoryTypeService implements MetaHistoryTypeService {
     }
 
     public List<MetaHistoryType> registAll(List<MetaHistoryType> metaHistoryTypes) throws OverflowException {
-        return (List<MetaHistoryType>)this.hisotyTypeDAO.save(metaHistoryTypes);
+        return (List<MetaHistoryType>)this.hisotyTypeDAO.saveAll(metaHistoryTypes);
     }
 }
diff --git a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorDisplayItemService.java b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorDisplayItemService.java
index 507c55f..eaa754d 100644
--- a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorDisplayItemService.java
+++ b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorDisplayItemService.java
@@ -23,7 +23,7 @@ public class CentralMetaSensorDisplayItemService implements MetaSensorDisplayIte
     }
 
     public MetaSensorDisplayItem read(Long id) throws OverflowException {
-        return this.displayItemDAO.findOne(id);
+        return this.displayItemDAO.findById(id).get();
     }
 
     public List<MetaSensorDisplayItem> readAllByCrawlerID(Short metaCrawlerID) throws OverflowException {
diff --git a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorItemTypeService.java b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorItemTypeService.java
index 73b2725..069f0e0 100644
--- a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorItemTypeService.java
+++ b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorItemTypeService.java
@@ -28,6 +28,6 @@ public class CentralMetaSensorItemTypeService implements MetaSensorItemTypeServi
     }
 
     public List<MetaSensorItemType> registAll(List<MetaSensorItemType> list) throws OverflowException {
-        return (List<MetaSensorItemType>)this.sensorItemTypeDAO.save(list);
+        return (List<MetaSensorItemType>)this.sensorItemTypeDAO.saveAll(list);
     }
 }
diff --git a/src/main/java/com/loafle/overflow/central/module/noauthprobe/service/CentralNoAuthProbeService.java b/src/main/java/com/loafle/overflow/central/module/noauthprobe/service/CentralNoAuthProbeService.java
index 42d45c9..e6cacf8 100644
--- a/src/main/java/com/loafle/overflow/central/module/noauthprobe/service/CentralNoAuthProbeService.java
+++ b/src/main/java/com/loafle/overflow/central/module/noauthprobe/service/CentralNoAuthProbeService.java
@@ -98,13 +98,13 @@ public class CentralNoAuthProbeService implements NoAuthProbeService {
   }
 
   public NoAuthProbe read(Long id) {
-    return this.noAuthProbeDAO.findOne(id);
+    return this.noAuthProbeDAO.findById(id).get();
   }
 
   @WebappAPI
   @Transactional
   public List<NoAuthProbe> acceptNoAuthProbe(Long noAuthProbeID) throws OverflowException {
-    NoAuthProbe noAuthProbe = this.noAuthProbeDAO.findOne(noAuthProbeID);
+    NoAuthProbe noAuthProbe = this.noAuthProbeDAO.findById(noAuthProbeID).get();
 
     NoAuthProbeDescription noAuthProbeDescription = null;
     try {
@@ -197,7 +197,7 @@ public class CentralNoAuthProbeService implements NoAuthProbeService {
 
   private void newProbeHost(InfraHost infraHost, Probe probe) throws OverflowException {
     ProbeHost probeHost = new ProbeHost();
-    probeHost.setHost(infraHost);
+    probeHost.setInfraHost(infraHost);
     probeHost.setProbe(probe);
 
     this.probeHostService.regist(probeHost);
@@ -205,7 +205,7 @@ public class CentralNoAuthProbeService implements NoAuthProbeService {
 
   @WebappAPI
   public List<NoAuthProbe> denyNoauthProbe(Long noAuthProbeID) throws OverflowException {
-    NoAuthProbe noAuthProbe = this.noAuthProbeDAO.findOne(noAuthProbeID);
+    NoAuthProbe noAuthProbe = this.noAuthProbeDAO.findById(noAuthProbeID).get();
 
     noAuthProbe.setMetaNoAuthProbeStatus(new MetaNoAuthProbeStatus((short) 2));
     this.noAuthProbeDAO.save(noAuthProbe);
diff --git a/src/main/java/com/loafle/overflow/central/module/notification/service/CentralNotificationService.java b/src/main/java/com/loafle/overflow/central/module/notification/service/CentralNotificationService.java
index 8e2d346..0830ea0 100644
--- a/src/main/java/com/loafle/overflow/central/module/notification/service/CentralNotificationService.java
+++ b/src/main/java/com/loafle/overflow/central/module/notification/service/CentralNotificationService.java
@@ -48,7 +48,7 @@ public class CentralNotificationService implements NotificationService {
         for (Notification n : list) {
             n.setConfirmDate(new Date());
         }
-        this.notificationDAO.save(list);
+        this.notificationDAO.saveAll(list);
         return this.readAllByMemberEmail(memberEmail, pageParams);
     }
 
@@ -58,12 +58,12 @@ public class CentralNotificationService implements NotificationService {
         for (Notification n : list) {
             n.setConfirmDate(null);
         }
-        this.notificationDAO.save(list);
+        this.notificationDAO.saveAll(list);
         return this.readAllByMemberEmail(memberEmail, pageParams);
     }
 
     public Notification markAsRead(Long notificationID) throws OverflowException {
-        Notification notification = this.notificationDAO.findOne(notificationID);
+        Notification notification = this.notificationDAO.findById(notificationID).get();
         notification.setConfirmDate(new Date());
         return this.notificationDAO.save(notification);
     }
diff --git a/src/main/java/com/loafle/overflow/central/module/probe/service/CentralProbeHostService.java b/src/main/java/com/loafle/overflow/central/module/probe/service/CentralProbeHostService.java
index d1dec5b..c00681c 100644
--- a/src/main/java/com/loafle/overflow/central/module/probe/service/CentralProbeHostService.java
+++ b/src/main/java/com/loafle/overflow/central/module/probe/service/CentralProbeHostService.java
@@ -20,7 +20,7 @@ public class CentralProbeHostService implements ProbeHostService {
     private ProbeHostDAO probeHostDAO;
 
     public ProbeHost read(Long id) throws OverflowException {
-        return this.probeHostDAO.findOne(id);
+        return this.probeHostDAO.findById(id).get();
     }
 
     public ProbeHost readByProbeID(Long probeID) throws OverflowException {
diff --git a/src/main/java/com/loafle/overflow/central/module/probe/service/CentralProbeService.java b/src/main/java/com/loafle/overflow/central/module/probe/service/CentralProbeService.java
index 295453c..8c8b3bb 100644
--- a/src/main/java/com/loafle/overflow/central/module/probe/service/CentralProbeService.java
+++ b/src/main/java/com/loafle/overflow/central/module/probe/service/CentralProbeService.java
@@ -28,7 +28,7 @@ public class CentralProbeService implements ProbeService {
     }
 
     public List<Probe> regist(List<Probe> probes) throws OverflowException {
-        return (List<Probe>)this.probeDAO.save(probes);
+        return (List<Probe>)this.probeDAO.saveAll(probes);
     }
 
     public List<Probe> readAllByDomainID(Long domainID) throws OverflowException {
@@ -37,7 +37,7 @@ public class CentralProbeService implements ProbeService {
     }
 
     public Probe read(Long id) throws OverflowException {
-        return this.probeDAO.findOne(id);
+        return this.probeDAO.findById(id).get();
     }
 
     public Probe readByProbeKey(String probeKey) throws OverflowException {
@@ -49,18 +49,18 @@ public class CentralProbeService implements ProbeService {
     }
 
     public boolean remove(Long id) throws OverflowException {
-        this.probeDAO.delete(id);
+        this.probeDAO.deleteById(id);
         return true;
     }
 
     public Probe increaseTargetCount(Probe probe) {
-        Probe p = this.probeDAO.findOne(probe.getId());
+        Probe p = this.probeDAO.findById(probe.getId()).get();
         p.setTargetCount(p.getTargetCount() + 1);
         return this.probeDAO.save(p);
     }
 
     public Probe decreaseTargetCount(Probe probe) {
-        Probe p = this.probeDAO.findOne(probe.getId());
+        Probe p = this.probeDAO.findById(probe.getId()).get();
         int count = p.getTargetCount();
         if (count > 0) {
             p.setTargetCount(count - 1);
@@ -69,7 +69,7 @@ public class CentralProbeService implements ProbeService {
     }
 
     public Probe modifyDisplayName(Long probeId, String displayName) {
-        Probe probe = this.probeDAO.findOne(probeId);
+        Probe probe = this.probeDAO.findById(probeId).get();
         probe.setDisplayName(displayName);
         return this.probeDAO.save(probe);
     }
diff --git a/src/main/java/com/loafle/overflow/central/module/sensor/dao/SensorItemDependencyDAO.java b/src/main/java/com/loafle/overflow/central/module/sensor/dao/SensorItemDependencyDAO.java
index 4081cf0..57088fa 100644
--- a/src/main/java/com/loafle/overflow/central/module/sensor/dao/SensorItemDependencyDAO.java
+++ b/src/main/java/com/loafle/overflow/central/module/sensor/dao/SensorItemDependencyDAO.java
@@ -4,6 +4,8 @@ import com.loafle.overflow.model.meta.MetaSensorItemKey;
 import com.loafle.overflow.model.sensor.SensorItemDependency;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -14,5 +16,6 @@ import java.util.List;
 @Repository
 public interface SensorItemDependencyDAO extends JpaRepository<SensorItemDependency, Long> {
 
-    List<MetaSensorItemKey> findAllByMetaSensorDisplayItemId(Long metaSensorDisplayItemId);
+    @Query("SELECT s.metaSensorItemKey from SensorItemDependency s where s.metaSensorDisplayItem.id = :metaSensorDisplayItemId")
+    List<MetaSensorItemKey> findAllMetaSensorItemKeyByMetaSensorDisplayItemId(@Param("metaSensorDisplayItemId") Long metaSensorDisplayItemId);
 }
diff --git a/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorItemDependencyService.java b/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorItemDependencyService.java
index fdc92e0..671b8e6 100644
--- a/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorItemDependencyService.java
+++ b/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorItemDependencyService.java
@@ -30,7 +30,7 @@ public class CentralSensorItemDependencyService implements SensorItemDependencyS
 
     public List<MetaSensorItemKey> readAllMetaSensorItemKeyByMetaSensorDisplayItemID(Long metaSensorDisplayItemID)
             throws OverflowException {
-        return this.sensorItemDependencyDAO.findAllByMetaSensorDisplayItemId(metaSensorDisplayItemID);
+        return this.sensorItemDependencyDAO.findAllMetaSensorItemKeyByMetaSensorDisplayItemId(metaSensorDisplayItemID);
     }
 
     public Map<String, List<MetaSensorItemKey>> readAllMapByMetaSensorDisplayItems(
@@ -40,7 +40,7 @@ public class CentralSensorItemDependencyService implements SensorItemDependencyS
 
         for (MetaSensorDisplayItem displayItem : metaSensorDisplayItems) {
             List<MetaSensorItemKey> itemKeys = this.sensorItemDependencyDAO
-                    .findAllByMetaSensorDisplayItemId(displayItem.getId());
+                    .findAllMetaSensorItemKeyByMetaSensorDisplayItemId(displayItem.getId());
             map.put(displayItem.getKey(), itemKeys);
         }
 
diff --git a/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorItemService.java b/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorItemService.java
index 2de6d2c..0dca043 100644
--- a/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorItemService.java
+++ b/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorItemService.java
@@ -29,7 +29,7 @@ public class CentralSensorItemService implements SensorItemService {
 
     @Transactional
     public SensorItem regist(SensorItem sensorItem) throws OverflowException {
-        Sensor s = sensorDAO.findOne(sensorItem.getSensor().getId());
+        Sensor s = sensorDAO.findById(sensorItem.getSensor().getId()).get();
         s.setItemCount((short) (s.getItemCount() + 1));
         this.sensorDAO.save(s);
         return this.sensorItemDAO.save(sensorItem);
@@ -37,15 +37,15 @@ public class CentralSensorItemService implements SensorItemService {
 
     @Transactional
     public boolean registAll(List<SensorItem> sensorItemList) throws OverflowException {
-        Sensor s = sensorDAO.findOne(sensorItemList.get(0).getSensor().getId());
+        Sensor s = sensorDAO.findById(sensorItemList.get(0).getSensor().getId()).get();
         s.setItemCount((short) sensorItemList.size());
         this.sensorDAO.save(s);
-        this.sensorItemDAO.save(sensorItemList);
+        this.sensorItemDAO.saveAll(sensorItemList);
         return true;
     }
 
     public SensorItem read(String id) throws OverflowException {
-        return this.sensorItemDAO.findOne(Long.valueOf(id));
+        return this.sensorItemDAO.findById(Long.valueOf(id)).get();
     }
 
     public Page<SensorItem> readAllBySensorID(Long sensorID, PageParams pageParams) throws OverflowException {
diff --git a/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorService.java b/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorService.java
index 55c57d1..85bd2d8 100644
--- a/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorService.java
+++ b/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorService.java
@@ -86,25 +86,25 @@ public class CentralSensorService implements SensorService {
     }
 
     public Sensor read(Long id) throws OverflowException {
-        return this.sensorDAO.findOne(Long.valueOf(id));
+        return this.sensorDAO.findById(Long.valueOf(id)).get();
     }
 
     @Transactional
     public void remove(Long sensorID) throws OverflowException {
-        Sensor sensor = this.sensorDAO.findOne(sensorID);
+        Sensor sensor = this.sensorDAO.findById(sensorID).get();
         this.targetService.decreaseSensorCount(sensor.getTarget());
         this.sensorDAO.delete(sensor);
     }
 
     public Sensor start(Long sensorID) throws OverflowException {
-        Sensor sensor = this.sensorDAO.findOne(sensorID);
+        Sensor sensor = this.sensorDAO.findById(sensorID).get();
         MetaSensorStatus status = new MetaSensorStatus((short) 1);
         sensor.setMetaSensorStatus(status);
         return this.sensorDAO.save(sensor);
     }
 
     public Sensor stop(Long sensorID) throws OverflowException {
-        Sensor sensor = this.sensorDAO.findOne(sensorID);
+        Sensor sensor = this.sensorDAO.findById(sensorID).get();
         MetaSensorStatus status = new MetaSensorStatus((short) 2);
         sensor.setMetaSensorStatus(status);
         return this.sensorDAO.save(sensor);
diff --git a/src/main/java/com/loafle/overflow/central/module/target/service/CentralTargetService.java b/src/main/java/com/loafle/overflow/central/module/target/service/CentralTargetService.java
index 6a956b0..c004ec5 100644
--- a/src/main/java/com/loafle/overflow/central/module/target/service/CentralTargetService.java
+++ b/src/main/java/com/loafle/overflow/central/module/target/service/CentralTargetService.java
@@ -50,7 +50,7 @@ public class CentralTargetService implements TargetService {
     }
 
     public Target read(String id) throws OverflowException {
-        return this.targetDAO.findOne(Long.valueOf(id));
+        return this.targetDAO.findById(Long.valueOf(id)).get();
     }
 
     public Target modify(Target target) throws OverflowException {
@@ -68,13 +68,13 @@ public class CentralTargetService implements TargetService {
     }
 
     public Target increaseSensorCount(Target target) throws OverflowException {
-        Target t = this.targetDAO.findOne(target.getId());
+        Target t = this.targetDAO.findById(target.getId()).get();
         t.setSensorCount(t.getSensorCount() + 1);
         return this.targetDAO.save(t);
     }
 
     public Target decreaseSensorCount(Target target) throws OverflowException {
-        Target t = this.targetDAO.findOne(target.getId());
+        Target t = this.targetDAO.findById(target.getId()).get();
         int count = t.getSensorCount();
         if (t.getSensorCount() > 0) {
             t.setSensorCount(count - 1);
diff --git a/src/main/java/com/loafle/overflow/central/spring/RedisConfiguration.java b/src/main/java/com/loafle/overflow/central/spring/RedisConfiguration.java
index b08a996..dea86bf 100644
--- a/src/main/java/com/loafle/overflow/central/spring/RedisConfiguration.java
+++ b/src/main/java/com/loafle/overflow/central/spring/RedisConfiguration.java
@@ -5,11 +5,15 @@ import com.loafle.overflow.central.redis.service.RedisMessagePublisher;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
+import org.springframework.data.redis.connection.jedis.JedisClientConfiguration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
+import org.springframework.data.redis.connection.jedis.JedisClientConfiguration.JedisClientConfigurationBuilder;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.listener.ChannelTopic;
 import org.springframework.data.redis.serializer.GenericToStringSerializer;
 
+import java.time.Duration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -25,9 +29,22 @@ public class RedisConfiguration {
 
     @Bean
     JedisConnectionFactory jedisConnectionFactory() {
-        JedisConnectionFactory jedisConFactory = new JedisConnectionFactory();
-        jedisConFactory.setHostName(host);
-        jedisConFactory.setPort(port);
+        RedisStandaloneConfiguration redisStandaloneConfiguration = new RedisStandaloneConfiguration();
+        redisStandaloneConfiguration.setHostName(host);
+        redisStandaloneConfiguration.setPort(port);
+        // redisStandaloneConfiguration.setDatabase(0);
+        // redisStandaloneConfiguration.setPassword(RedisPassword.of("password"));
+
+        JedisClientConfigurationBuilder jedisClientConfiguration = JedisClientConfiguration.builder();
+        jedisClientConfiguration.connectTimeout(Duration.ofSeconds(60));// 60s connection timeout
+
+        JedisConnectionFactory jedisConFactory = new JedisConnectionFactory(redisStandaloneConfiguration,
+                jedisClientConfiguration.build());
+
+
+        // JedisConnectionFactory jedisConFactory = new JedisConnectionFactory();
+        // jedisConFactory.setHostName(host);
+        // jedisConFactory.setPort(port);
         return jedisConFactory;
     }
 
diff --git a/src/main/resources/local/database.properties b/src/main/resources/local/database.properties
index a04336a..3a0ac6c 100644
--- a/src/main/resources/local/database.properties
+++ b/src/main/resources/local/database.properties
@@ -8,4 +8,4 @@ jpa.database=postgresql
 jpa.hibernate.ddl-auto=create
 #jpa.hibernate.ddl-auto=update
 jpa.hibernate.naming-strategy=org.hibernate.cfg.ImprovedNamingStrategy
-jpa.show-sql=true
+jpa.show-sql=false
diff --git a/src/main/resources/local/init.sql b/src/main/resources/local/init.sql
index 13a1fe6..656822d 100644
--- a/src/main/resources/local/init.sql
+++ b/src/main/resources/local/init.sql
@@ -22,186 +22,186 @@ INSERT INTO public.meta_infra_type (id,create_date,"name") VALUES (
 INSERT INTO public.meta_infra_type (id,create_date,"name") VALUES (
 7,'2017-06-25 17:31:42.906','OS_SERVICE');
 
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 1,'2017-07-27 15:26:52.985','APPLE',1);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 2,'2017-07-27 15:26:52.985','MICROSOFT',1);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 3,'2017-07-27 15:26:52.985','ASUS',1);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 4,'2017-07-27 15:26:52.985','HP',1);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 5,'2017-07-27 15:26:52.985','DELL',1);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 6,'2017-07-27 15:26:52.985','LENOVO',1);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 7,'2017-07-27 15:26:52.985','ACER',1);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 8,'2017-07-27 15:26:52.985','SAMSUNG',1);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 9,'2017-07-27 15:26:52.985','LG',1);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 10,'2017-07-27 15:26:52.985','CISCO',1);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 11,'2017-07-27 15:26:52.985','Windows',2);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 12,'2017-07-27 15:26:52.985','Linux',2);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 13,'2017-07-27 15:26:52.985','Mac OS',2);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 14,'2017-07-27 15:26:52.985','Ubuntu',2);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 15,'2017-07-27 15:26:52.985','Cent OS',2);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 16,'2017-07-27 15:26:52.985','Fedora',2);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 17,'2017-07-27 15:26:52.985','Red Hat',2);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 18,'2017-07-27 15:26:52.985','Debian',2);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 19,'2017-07-27 15:26:52.985','SUSE',2);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 20,'2017-07-27 15:26:52.985','Core OS',2);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 21,'2017-07-27 15:26:52.985','Amazon Linux',2);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 22,'2017-07-27 15:26:52.985','Kubernetes',2);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 23,'2017-07-27 15:26:52.985','Docker',2);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 24,'2017-07-27 15:26:52.985','iOS',2);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 25,'2017-07-27 15:26:52.985','Android',2);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 26,'2017-07-27 15:26:52.985','Windows',3);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 27,'2017-07-27 15:26:52.985','Mac OS',3);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 28,'2017-07-27 15:26:52.985','Ubuntu',3);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 29,'2017-07-27 15:26:52.985','Cent OS',3);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 30,'2017-07-27 15:26:52.985','Fedora',3);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 31,'2017-07-27 15:26:52.985','Red Hat',3);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 32,'2017-07-27 15:26:52.985','Debian',3);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 33,'2017-07-27 15:26:52.985','SUSE',3);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 34,'2017-07-27 15:26:52.985','Core OS',3);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 35,'2017-07-27 15:26:52.985','Amazon Linux',3);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 36,'2017-07-27 15:26:52.985','Kubernetes',3);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 37,'2017-07-27 15:26:52.985','Docker',3);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 38,'2017-07-27 15:26:52.985','iOS',3);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 39,'2017-07-27 15:26:52.985','Android',3);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 40,'2017-07-27 15:26:52.985','ACTIVEDIRECTORY',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 41,'2017-07-27 15:26:52.985','CASSANDRA',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 42,'2017-07-27 15:26:52.985','DHCP',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 43,'2017-07-27 15:26:52.985','DNS',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 44,'2017-07-27 15:26:52.985','FTP',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 45,'2017-07-27 15:26:52.985','HTTP',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 46,'2017-07-27 15:26:52.985','IMAP',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 47,'2017-07-27 15:26:52.985','LDAP',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 48,'2017-07-27 15:26:52.985','MONGODB',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 49,'2017-07-27 15:26:52.985','MSSQL',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 50,'2017-07-27 15:26:52.985','MYSQL',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 51,'2017-07-27 15:26:52.985','NETBIOS',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 52,'2017-07-27 15:26:52.985','ORACLE',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 53,'2017-07-27 15:26:52.985','POP',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 54,'2017-07-27 15:26:52.985','POSTGRESQL',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 55,'2017-07-27 15:26:52.985','REDIS',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 56,'2017-07-27 15:26:52.985','RMI',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 57,'2017-07-27 15:26:52.985','SMB',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 58,'2017-07-27 15:26:52.985','SMTP',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 59,'2017-07-27 15:26:52.985','SNMP',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 60,'2017-07-27 15:26:52.985','SSH',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 61,'2017-07-27 15:26:52.985','TELNET',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 62,'2017-07-27 15:26:52.985','WMI',7);
--- INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+-- INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 -- 63,'2017-07-27 15:26:52.985','UNKNOWN',7);
 
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 1,'2017-07-27 15:26:52.985','ACTIVEDIRECTORY',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 2,'2017-07-27 15:26:52.985','CASSANDRA',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 3,'2017-07-27 15:26:52.985','DHCP',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 4,'2017-07-27 15:26:52.985','DNS',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 5,'2017-07-27 15:26:52.985','FTP',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 6,'2017-07-27 15:26:52.985','HTTP',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 7,'2017-07-27 15:26:52.985','IMAP',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 8,'2017-07-27 15:26:52.985','LDAP',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 9,'2017-07-27 15:26:52.985','MONGODB',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 10,'2017-07-27 15:26:52.985','MSSQL',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 11,'2017-07-27 15:26:52.985','MYSQL',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 12,'2017-07-27 15:26:52.985','NETBIOS',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 13,'2017-07-27 15:26:52.985','ORACLE',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 14,'2017-07-27 15:26:52.985','POP',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 15,'2017-07-27 15:26:52.985','POSTGRESQL',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 16,'2017-07-27 15:26:52.985','REDIS',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 17,'2017-07-27 15:26:52.985','RMI',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 18,'2017-07-27 15:26:52.985','SMB',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 19,'2017-07-27 15:26:52.985','SMTP',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 20,'2017-07-27 15:26:52.985','SNMP',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 21,'2017-07-27 15:26:52.985','SSH',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 22,'2017-07-27 15:26:52.985','TELNET',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 23,'2017-07-27 15:26:52.985','WMI',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 24,'2017-07-27 15:26:52.985','UNKNOWN',7);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 25,'2017-11-10 15:26:52.985','SSH',2);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 26,'2017-11-10 15:26:52.985','WMI',2);
-INSERT INTO public.meta_infra_vendor (id,create_date,name,type_id) VALUES (
+INSERT INTO public.meta_infra_vendor (id,create_date,name,meta_infra_type_id) VALUES (
 27,'2017-11-10 15:26:52.985','SNMP',2);
 
 
@@ -269,41 +269,41 @@ INSERT INTO public.meta_input_type (id,create_date,description,"name") VALUES (
 5,'2017-06-25 17:00:53.920','SELECT','SELECT_TYPE');
 
 
-INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,crawler_id,type_id) VALUES (
+INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,meta_crawler_id,meta_input_type_id) VALUES (
 '1','2017-06-25 17:01','Loafle','Windows Account ID','','','ID','','TRUE','23','1');
-INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,crawler_id,type_id) VALUES (
+INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,meta_crawler_id,meta_input_type_id) VALUES (
 '2','2017-06-25 17:01','','Windows Account PW','','','PassWord','','TRUE','23','2');
-INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,crawler_id,type_id) VALUES (
+INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,meta_crawler_id,meta_input_type_id) VALUES (
 '3','2017-06-25 17:01','public','SNMP V2 Community','','','Community','','TRUE','20','1');
-INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,crawler_id,type_id) VALUES (
+INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,meta_crawler_id,meta_input_type_id) VALUES (
 '4','2017-06-25 17:01','mysqldb','MYSQL DB Name','','','DB Name','','TRUE','11','1');
-INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,crawler_id,type_id) VALUES (
+INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,meta_crawler_id,meta_input_type_id) VALUES (
 '5','2017-06-25 17:01','Loafle','MYSQL Account ID','','','ID','','TRUE','11','1');
-INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,crawler_id,type_id) VALUES (
+INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,meta_crawler_id,meta_input_type_id) VALUES (
 '6','2017-06-25 17:01','','MYSQL Account PW','','','PassWord','','TRUE','11','2');
-INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,crawler_id,type_id) VALUES (
+INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,meta_crawler_id,meta_input_type_id) VALUES (
 '7','2017-06-25 17:01','Loafle','JMX Account ID','','','ID','','TRUE','17','1');
-INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,crawler_id,type_id) VALUES (
+INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,meta_crawler_id,meta_input_type_id) VALUES (
 '8','2017-06-25 17:01','','JMX Account PW','','','PassWord','','TRUE','17','2');
-INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,crawler_id,type_id) VALUES (
+INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,meta_crawler_id,meta_input_type_id) VALUES (
 '9','2017-09-11 18:41','MD5','SNMP V3 Auth Type','','MD5|SHA','AuthType','','TRUE','25','5');
-INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,crawler_id,type_id) VALUES (
+INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,meta_crawler_id,meta_input_type_id) VALUES (
 '10','2017-09-11 18:41','Loafle','SNMP V3 User ID','','','ID','','TRUE','25','1');
-INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,crawler_id,type_id) VALUES (
+INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,meta_crawler_id,meta_input_type_id) VALUES (
 '11','2017-09-11 18:41','','SNMP V3 PassWord','','','PassWord','','TRUE','25','2');
-INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,crawler_id,type_id) VALUES (
+INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,meta_crawler_id,meta_input_type_id) VALUES (
 '12','2017-09-11 18:41','DES','SNMP V3 Encryption Type','','DES|AES','Encryption Type','','TRUE','25','5');
-INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,crawler_id,type_id) VALUES (
+INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,meta_crawler_id,meta_input_type_id) VALUES (
 '13','2017-09-11 18:41','Loafle','SNMP V3 Encryption Key','','','Encryption Key','','TRUE','25','1');
-INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,crawler_id,type_id) VALUES (
+INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,meta_crawler_id,meta_input_type_id) VALUES (
 '14','2017-06-25 17:01','redis','Redis DB Name','','','DB Name','','TRUE','16','1');
-INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,crawler_id,type_id) VALUES (
+INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,meta_crawler_id,meta_input_type_id) VALUES (
 '15','2017-06-25 17:01','Loafle','Redis Account ID','','','ID','','TRUE','16','1');
-INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,crawler_id,type_id) VALUES (
+INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,meta_crawler_id,meta_input_type_id) VALUES (
 '16','2017-06-25 17:01','','Redis Account PW','','','PassWord','','TRUE','16','2');
-INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,crawler_id,type_id) VALUES (
+INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,meta_crawler_id,meta_input_type_id) VALUES (
 '17','2017-06-25 17:01','Loafle','SSH User','','','ID','','TRUE','21','1');
-INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,crawler_id,type_id) VALUES (
+INSERT INTO meta_crawler_input_item (id,create_date,default_value,description,key_name,key_value,name,pattern,required,meta_crawler_id,meta_input_type_id) VALUES (
 '18','2017-06-25 17:01','','SSH PW','','','PassWord','','TRUE','21','2');
 
 
@@ -328,37 +328,37 @@ INSERT INTO public.meta_probe_version (id,create_date,"version") VALUES (
 2,'2017-06-25 16:48:00.558','1.1.0');
 
 
-INSERT INTO public.meta_probe_package (id,create_date,architecture_id,os_id,version_id) VALUES (
+INSERT INTO public.meta_probe_package (id,create_date,meta_probe_architecture_id,meta_probe_os_id,meta_probe_version_id) VALUES (
 1,'2017-06-25 16:59:59.194',1,1,1);
-INSERT INTO public.meta_probe_package (id,create_date,architecture_id,os_id,version_id) VALUES (
+INSERT INTO public.meta_probe_package (id,create_date,meta_probe_architecture_id,meta_probe_os_id,meta_probe_version_id) VALUES (
 2,'2017-06-25 16:59:59.216',1,2,1);
-INSERT INTO public.meta_probe_package (id,create_date,architecture_id,os_id,version_id) VALUES (
+INSERT INTO public.meta_probe_package (id,create_date,meta_probe_architecture_id,meta_probe_os_id,meta_probe_version_id) VALUES (
 3,'2017-06-25 16:59:59.255',1,3,1);
-INSERT INTO public.meta_probe_package (id,create_date,architecture_id,os_id,version_id) VALUES (
+INSERT INTO public.meta_probe_package (id,create_date,meta_probe_architecture_id,meta_probe_os_id,meta_probe_version_id) VALUES (
 4,'2017-06-25 16:59:59.268',1,4,1);
-INSERT INTO public.meta_probe_package (id,create_date,architecture_id,os_id,version_id) VALUES (
+INSERT INTO public.meta_probe_package (id,create_date,meta_probe_architecture_id,meta_probe_os_id,meta_probe_version_id) VALUES (
 5,'2017-06-25 16:59:59.279',2,1,1);
-INSERT INTO public.meta_probe_package (id,create_date,architecture_id,os_id,version_id) VALUES (
+INSERT INTO public.meta_probe_package (id,create_date,meta_probe_architecture_id,meta_probe_os_id,meta_probe_version_id) VALUES (
 6,'2017-06-25 16:59:59.307',2,2,1);
-INSERT INTO public.meta_probe_package (id,create_date,architecture_id,os_id,version_id) VALUES (
+INSERT INTO public.meta_probe_package (id,create_date,meta_probe_architecture_id,meta_probe_os_id,meta_probe_version_id) VALUES (
 7,'2017-06-25 16:59:59.317',2,3,1);
-INSERT INTO public.meta_probe_package (id,create_date,architecture_id,os_id,version_id) VALUES (
+INSERT INTO public.meta_probe_package (id,create_date,meta_probe_architecture_id,meta_probe_os_id,meta_probe_version_id) VALUES (
 8,'2017-06-25 16:59:59.330',2,4,1);
-INSERT INTO public.meta_probe_package (id,create_date,architecture_id,os_id,version_id) VALUES (
+INSERT INTO public.meta_probe_package (id,create_date,meta_probe_architecture_id,meta_probe_os_id,meta_probe_version_id) VALUES (
 9,'2017-06-25 16:59:59.363',1,1,2);
-INSERT INTO public.meta_probe_package (id,create_date,architecture_id,os_id,version_id) VALUES (
+INSERT INTO public.meta_probe_package (id,create_date,meta_probe_architecture_id,meta_probe_os_id,meta_probe_version_id) VALUES (
 10,'2017-06-25 16:59:59.395',1,2,2);
-INSERT INTO public.meta_probe_package (id,create_date,architecture_id,os_id,version_id) VALUES (
+INSERT INTO public.meta_probe_package (id,create_date,meta_probe_architecture_id,meta_probe_os_id,meta_probe_version_id) VALUES (
 11,'2017-06-25 16:59:59.416',1,3,2);
-INSERT INTO public.meta_probe_package (id,create_date,architecture_id,os_id,version_id) VALUES (
+INSERT INTO public.meta_probe_package (id,create_date,meta_probe_architecture_id,meta_probe_os_id,meta_probe_version_id) VALUES (
 12,'2017-06-25 16:59:59.446',1,4,2);
-INSERT INTO public.meta_probe_package (id,create_date,architecture_id,os_id,version_id) VALUES (
+INSERT INTO public.meta_probe_package (id,create_date,meta_probe_architecture_id,meta_probe_os_id,meta_probe_version_id) VALUES (
 13,'2017-06-25 16:59:59.468',2,1,2);
-INSERT INTO public.meta_probe_package (id,create_date,architecture_id,os_id,version_id) VALUES (
+INSERT INTO public.meta_probe_package (id,create_date,meta_probe_architecture_id,meta_probe_os_id,meta_probe_version_id) VALUES (
 14,'2017-06-25 16:59:59.484',2,2,2);
-INSERT INTO public.meta_probe_package (id,create_date,architecture_id,os_id,version_id) VALUES (
+INSERT INTO public.meta_probe_package (id,create_date,meta_probe_architecture_id,meta_probe_os_id,meta_probe_version_id) VALUES (
 15,'2017-06-25 16:59:59.507',2,3,2);
-INSERT INTO public.meta_probe_package (id,create_date,architecture_id,os_id,version_id) VALUES (
+INSERT INTO public.meta_probe_package (id,create_date,meta_probe_architecture_id,meta_probe_os_id,meta_probe_version_id) VALUES (
 16,'2017-06-25 16:59:59.522',2,4,2);
 
 INSERT INTO public.meta_probe_status (id,"name") VALUES (
@@ -494,361 +494,361 @@ INSERT INTO public.meta_sensor_item (id,create_date,"key",name) VALUES (
 INSERT INTO public.meta_sensor_item (id,create_date,"key",name) VALUES (
 '146','2017-11-06 00:00:00','mem.paging.usage.free','');
 
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '119','2017-06-26 19:49:00','cat /proc/stat','user','','21','123','7');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '120','2017-06-26 19:49:00','cat /proc/stat','nice','','21','124','7');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '121','2017-06-26 19:49:00','cat /proc/stat','system','','21','125','7');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '122','2017-06-26 19:49:00','cat /proc/stat','idle','','21','126','7');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '123','2017-06-26 19:49:00','cat /proc/stat','iowait','','21','127','7');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '124','2017-06-26 19:49:00','cat /proc/stat','irq','','21','128','7');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '125','2017-06-26 19:49:00','cat /proc/stat','softirq','','21','129','7');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '126','2017-06-26 19:49:00','cat /proc/stat','steal','','21','130','7');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '127','2017-06-26 19:49:01','cat /proc/stat','guest','','21','131','7');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '128','2017-06-26 19:49:02','cat /proc/stat','gnice','','21','132','7');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '129','2017-06-26 19:49:03','Win32_PerfFormattedData_PerfOS_Processor','PercentIdleTime','{"where": "Name=''_Total''"}','23','126','1');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '130','2017-06-26 19:49:04','Win32_PerfFormattedData_PerfOS_Processor','PercentProcessorTime','{"where": "Name=''_Total''"}','23','133','1');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '131','2017-06-26 19:49:04','Win32_PerfFormattedData_PerfOS_Processor','PercentUserTime','{"where": "Name=''_Total''"}','23','123','1');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '132','2017-06-26 19:49:04','Win32_PerfFormattedData_PerfOS_Processor','PercentPrivilegedTime','{"where": "Name=''_Total''"}','23','134','1');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '133','2017-06-26 19:49:04','cat /proc/meminfo','total','','21','135','3');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '134','2017-06-26 19:49:04','cat /proc/meminfo','free','','21','136','3');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '135','2017-06-26 19:49:04','cat /proc/meminfo','available','','21','137','3');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '136','2017-06-26 19:49:04','cat /proc/meminfo','buffers','','21','138','3');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '137','2017-06-26 19:49:04','cat /proc/meminfo','cached','','21','139','3');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '138','2017-06-26 19:49:04','cat /proc/meminfo','swapTotal','','21','140','3');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '139','2017-06-26 19:49:04','cat /proc/meminfo','swapFree','','21','141','3');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '140','2017-06-26 19:49:04','cat /proc/meminfo','swapCached','','21','142','3');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '141','2017-06-26 19:49:04','Win32_OperatingSystem ','TotalVisibleMemorySize','','23','135','3');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '142','2017-06-26 19:49:04','Win32_OperatingSystem ','FreePhysicalMemory','','23','136','3');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '143','2017-06-26 19:49:04','Win32_OperatingSystem ','TotalVirtualMemorySize','','23','143','3');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '144','2017-06-26 19:49:04','Win32_OperatingSystem ','FreeVirtualMemory','','23','144','3');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '145','2017-06-26 19:49:04','Win32_OperatingSystem ','SizeStoredInPagingFiles','','23','145','3');
-INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,crawler_id,item_id,unit_id) VALUES (
+INSERT INTO meta_sensor_item_key (id,create_date,froms,"key",option_json,meta_crawler_id,meta_sensor_item_id,meta_sensor_item_unit_id) VALUES (
 '146','2017-06-26 19:49:04','Win32_OperatingSystem ','FreeSpaceInPagingFiles','','23','146','3');
 
 
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '1','2017-11-07 16:08:59','true','','CPU Total usage (%)','ssh.cpu.usage.total','21','1','1');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '2','2017-11-07 16:08:59','false','','CPU User (%)','ssh.cpu.usage.user','21','1','1');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '3','2017-11-07 16:08:59','false','','CPU Nice (%)','ssh.cpu.usage.nice','21','1','1');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '4','2017-11-07 16:08:59','false','','CPU System (%)','ssh.cpu.usage.system','21','1','1');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '5','2017-11-07 16:08:59','false','','CPU Idle (%)','ssh.cpu.usage.idle','21','1','1');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '6','2017-11-07 16:08:59','false','','CPU IO wait (%)','ssh.cpu.usage.iowait','21','1','1');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '7','2017-11-07 16:08:59','false','','CPU IRQ (%)','ssh.cpu.usage.irq','21','1','1');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '8','2017-11-07 16:08:59','false','','CPU Soft IRQ (%)','ssh.cpu.usage.softirq','21','1','1');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '9','2017-11-07 16:08:59','false','','CPU Steal (%)','ssh.cpu.usage.steal','21','1','1');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '10','2017-11-07 16:08:59','false','','CPU Guest (%)','ssh.cpu.usage.guest','21','1','1');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '11','2017-11-07 16:08:59','false','','CPU Guest Nice (%)','ssh.cpu.usage.gnice','21','1','1');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '12','2017-11-07 16:08:59','true','','CPU Total usage (%)','wmi.cpu.usage.total','23','1','1');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '13','2017-11-07 16:08:59','false','','CPU Idle (%)','wmi.cpu.usage.idle','23','1','1');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '14','2017-11-07 16:08:59','false','','CPU Processor (%)','wmi.cpu.usage.processor','23','1','1');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '15','2017-11-07 16:08:59','false','','CPU User (%)','wmi.cpu.usage.user','23','1','1');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '16','2017-11-07 16:08:59','false','','CPU Privilege (%)','wmi.cpu.usage.privilege','23','1','1');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '17','2017-11-07 16:08:59','true','','Memory Total Usage (%)','ssh.mem.usage.total','21','1','2');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '18','2017-11-07 16:08:59','false','','Memory Free space (mb)','ssh.mem.usage.free','21','4','2');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '19','2017-11-07 16:08:59','false','','Buffered Memory (mb)','ssh.mem.usage.buffers','21','4','2');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '20','2017-11-07 16:08:59','false','','Cached Memory (mb)','ssh.mem.usage.cached','21','4','2');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '21','2017-11-07 16:08:59','true','','Swap Total Usage (%)','ssh.mem.swap.usage.total','21','1','2');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '22','2017-11-07 16:08:59','false','','Cached Swap (mb)','ssh.mem.swap.usage.cached','21','4','2');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '23','2017-11-07 16:08:59','true','','Memory Total usage (%)','wmi.mem.usage.total','23','1','2');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '24','2017-11-07 16:08:59','false','','Virtual  Memory Usage (%)','wmi.mem.virtual.usage.total','23','1','2');
-INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",crawler_id,unit_id,type_id) VALUES (
+INSERT INTO meta_sensor_display_item (id,create_date,is_default,description,display_name,"key",meta_crawler_id,meta_sensor_item_unit_id,meta_sensor_item_type_id) VALUES (
 '25','2017-11-07 16:08:59','false','','Paging Usage  (%)','wmi.mem.paging.usage.total','23','1','2');
-INSERT INTO meta_sensor_display_item (id, create_date, is_default, description, display_name, key, crawler_id, type_id, unit_id) VALUES (201, '2017-11-07 16:08:59', true, 'The rate of connections to the server.', 'Connections', 'MYSQL.NET.CONNECTIONS', 11, 15, 6);
-INSERT INTO meta_sensor_display_item (id, create_date, is_default, description, display_name, key, crawler_id, type_id, unit_id) VALUES (202, '2017-11-07 16:08:59', true, 'The rate of data reads and writes.', 'Reads & Writes', 'MYSQL.INNODB.READSWRITES', 11, 14, 6);
-INSERT INTO meta_sensor_display_item (id, create_date, is_default, description, display_name, key, crawler_id, type_id, unit_id) VALUES (203, '2017-11-07 16:08:59', true, 'Fraction of time spent (ms/s) acquring row locks.', 'Row Lock Time (ms/s)', 'MYSQL.INNODB.ROW_LOCK_TIME', 11, 14, 0);
-INSERT INTO meta_sensor_display_item (id, create_date, is_default, description, display_name, key, crawler_id, type_id, unit_id) VALUES (204, '2017-11-07 16:08:59', true, 'The number of times per second a row lock had to be waited for.', 'Row Lock Waits', 'MYSQL.INNODB.ROW_LOCK_WAITS', 11, 14, 6);
-INSERT INTO meta_sensor_display_item (id, create_date, is_default, description, display_name, key, crawler_id, type_id, unit_id) VALUES (205, '2017-11-07 16:08:59', true, 'The rate of slow queries.', 'Slow Queries', 'MYSQL.PERFORMANCE.SLOW_QUERIES', 11, 16, 6);
-INSERT INTO meta_sensor_display_item (id, create_date, is_default, description, display_name, key, crawler_id, type_id, unit_id) VALUES (206, '2017-11-07 16:08:59', true, 'The rate of queries.', 'Queries', 'MYSQL.PERFORMANCE.QUERIES', 11, 16, 6);
+INSERT INTO meta_sensor_display_item (id, create_date, is_default, description, display_name, key, meta_crawler_id, meta_sensor_item_type_id, meta_sensor_item_unit_id) VALUES (201, '2017-11-07 16:08:59', true, 'The rate of connections to the server.', 'Connections', 'MYSQL.NET.CONNECTIONS', 11, 15, 6);
+INSERT INTO meta_sensor_display_item (id, create_date, is_default, description, display_name, key, meta_crawler_id, meta_sensor_item_type_id, meta_sensor_item_unit_id) VALUES (202, '2017-11-07 16:08:59', true, 'The rate of data reads and writes.', 'Reads & Writes', 'MYSQL.INNODB.READSWRITES', 11, 14, 6);
+INSERT INTO meta_sensor_display_item (id, create_date, is_default, description, display_name, key, meta_crawler_id, meta_sensor_item_type_id, meta_sensor_item_unit_id) VALUES (203, '2017-11-07 16:08:59', true, 'Fraction of time spent (ms/s) acquring row locks.', 'Row Lock Time (ms/s)', 'MYSQL.INNODB.ROW_LOCK_TIME', 11, 14, 0);
+INSERT INTO meta_sensor_display_item (id, create_date, is_default, description, display_name, key, meta_crawler_id, meta_sensor_item_type_id, meta_sensor_item_unit_id) VALUES (204, '2017-11-07 16:08:59', true, 'The number of times per second a row lock had to be waited for.', 'Row Lock Waits', 'MYSQL.INNODB.ROW_LOCK_WAITS', 11, 14, 6);
+INSERT INTO meta_sensor_display_item (id, create_date, is_default, description, display_name, key, meta_crawler_id, meta_sensor_item_type_id, meta_sensor_item_unit_id) VALUES (205, '2017-11-07 16:08:59', true, 'The rate of slow queries.', 'Slow Queries', 'MYSQL.PERFORMANCE.SLOW_QUERIES', 11, 16, 6);
+INSERT INTO meta_sensor_display_item (id, create_date, is_default, description, display_name, key, meta_crawler_id, meta_sensor_item_type_id, meta_sensor_item_unit_id) VALUES (206, '2017-11-07 16:08:59', true, 'The rate of queries.', 'Queries', 'MYSQL.PERFORMANCE.QUERIES', 11, 16, 6);
 
 
 
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '1','1','119');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '2','1','120');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '3','1','121');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '4','1','122');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '5','1','123');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '6','1','124');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '7','1','125');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '8','1','126');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '9','1','127');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '10','1','128');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '11','2','119');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '12','3','120');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '13','4','121');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '14','5','122');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '15','6','123');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '16','7','124');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '17','8','125');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '18','9','126');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '19','10','127');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '20','11','128');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '21','12','129');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '22','12','130');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '23','12','131');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '24','12','132');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '25','13','129');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '26','14','130');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '27','15','131');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '28','16','132');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '29','17','133');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '30','17','134');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '31','17','135');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '32','17','136');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '33','17','137');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '34','18','134');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '35','19','136');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '36','20','137');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '37','21','138');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '38','21','139');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '39','21','140');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '40','22','140');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '41','23','141');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '42','23','142');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '43','23','143');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '44','23','144');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '45','23','145');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '46','23','146');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '47','24','143');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '48','24','144');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '49','25','145');
-INSERT INTO meta_sensor_display_mapping (id,display_item_id,item_key_id) VALUES (
+INSERT INTO meta_sensor_display_mapping (id,meta_sensor_display_item_id,meta_sensor_item_key_id) VALUES (
 '50','25','146');
 
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 1,'2017-07-27 15:29:48.634',23,26);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 2,'2017-07-27 15:29:48.634',20,26);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 3,'2017-07-27 15:29:48.634',20,28);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 4,'2017-07-27 15:29:48.634',20,29);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 5,'2017-07-27 15:29:48.634',20,30);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 6,'2017-07-27 15:29:48.634',20,31);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 7,'2017-07-27 15:29:48.634',20,32);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 8,'2017-07-27 15:29:48.634',1,40);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 9,'2017-07-27 15:29:48.634',2,41);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 10,'2017-07-27 15:29:48.634',3,42);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 11,'2017-07-27 15:29:48.634',4,43);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 12,'2017-07-27 15:29:48.634',5,44);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 13,'2017-07-27 15:29:48.634',6,45);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 14,'2017-07-27 15:29:48.634',7,46);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 15,'2017-07-27 15:29:48.634',8,47);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 16,'2017-07-27 15:29:48.634',9,48);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 17,'2017-07-27 15:29:48.634',10,49);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 18,'2017-07-27 15:29:48.634',11,50);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 19,'2017-07-27 15:29:48.634',12,51);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 20,'2017-07-27 15:29:48.634',13,52);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 21,'2017-07-27 15:29:48.634',14,53);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 22,'2017-07-27 15:29:48.634',15,54);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 23,'2017-07-27 15:29:48.634',16,55);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 24,'2017-07-27 15:29:48.634',17,56);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 25,'2017-07-27 15:29:48.634',18,57);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 26,'2017-07-27 15:29:48.634',19,58);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 27,'2017-07-27 15:29:48.634',20,59);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 28,'2017-07-27 15:29:48.634',21,60);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 29,'2017-07-27 15:29:48.634',22,61);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 30,'2017-07-27 15:29:48.634',23,62);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 31,'2017-07-27 15:29:48.634',24,63);
 --
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 32,'2017-07-27 15:29:48.634',25,26);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 33,'2017-07-27 15:29:48.634',25,28);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 34,'2017-07-27 15:29:48.634',25,29);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 35,'2017-07-27 15:29:48.634',25,30);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 36,'2017-07-27 15:29:48.634',25,31);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 37,'2017-07-27 15:29:48.634',25,32);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 32,'2017-07-27 15:29:48.634',25,26);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 33,'2017-07-27 15:29:48.634',25,28);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 34,'2017-07-27 15:29:48.634',25,29);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 35,'2017-07-27 15:29:48.634',25,30);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 36,'2017-07-27 15:29:48.634',25,31);
--- INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+-- INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 -- 37,'2017-07-27 15:29:48.634',25,32);
 
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 1,'2017-07-27 15:29:48.634',1,1);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 2,'2017-07-27 15:29:48.634',2,2);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 3,'2017-07-27 15:29:48.634',3,3);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 4,'2017-07-27 15:29:48.634',4,4);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 5,'2017-07-27 15:29:48.634',5,5);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 6,'2017-07-27 15:29:48.634',6,6);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 7,'2017-07-27 15:29:48.634',7,7);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 8,'2017-07-27 15:29:48.634',8,8);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 9,'2017-07-27 15:29:48.634',9,9);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 10,'2017-07-27 15:29:48.634',10,10);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 11,'2017-07-27 15:29:48.634',11,11);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 12,'2017-07-27 15:29:48.634',12,12);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 13,'2017-07-27 15:29:48.634',13,13);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 14,'2017-07-27 15:29:48.634',14,14);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 15,'2017-07-27 15:29:48.634',15,15);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 16,'2017-07-27 15:29:48.634',16,16);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 17,'2017-07-27 15:29:48.634',17,17);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 18,'2017-07-27 15:29:48.634',18,18);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 19,'2017-07-27 15:29:48.634',19,19);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 20,'2017-07-27 15:29:48.634',20,20);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 21,'2017-07-27 15:29:48.634',21,21);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 22,'2017-07-27 15:29:48.634',22,22);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 23,'2017-07-27 15:29:48.634',23,23);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 24,'2017-07-27 15:29:48.634',24,24);
-INSERT INTO public.meta_vendor_crawler (id,create_date,crawler_id,vendor_id) VALUES (
+INSERT INTO public.meta_vendor_crawler (id,create_date,meta_crawler_id,meta_infra_vendor_id) VALUES (
 25,'2017-07-27 15:29:48.634',25,20);
 
 INSERT INTO public.meta_history_type (id,create_date,"name") VALUES (
@@ -876,22 +876,22 @@ INSERT INTO public.meta_email_status (id,create_date,"name") VALUES (
 
 
 
-INSERT INTO public."member" (company_name,create_date,email,"name",phone,pw,status_id) VALUES (
+INSERT INTO public."member" (company_name,create_date,email,"name",phone,pw,meta_member_status_id) VALUES (
 'loafle','2017-06-26 11:07:27.625','overflow@loafle.com','overFlow','000-000-0000','$2a$10$G2bbjoX9.fOnxJx/8DZqPujFYrEQtIEB.f98/8K20XiGWEhwPakZ.',2);
 
-INSERT INTO public."member" (company_name,create_date,email,"name",phone,pw,status_id) VALUES (
+INSERT INTO public."member" (company_name,create_date,email,"name",phone,pw,meta_member_status_id) VALUES (
 'loafle','2017-06-26 11:07:27.625','insanity@loafle.com','overFlow','000-000-0000','$2a$10$G2bbjoX9.fOnxJx/8DZqPujFYrEQtIEB.f98/8K20XiGWEhwPakZ.',2);
 
-INSERT INTO public."member" (company_name,create_date,email,"name",phone,pw,status_id) VALUES (
+INSERT INTO public."member" (company_name,create_date,email,"name",phone,pw,meta_member_status_id) VALUES (
 'loafle','2017-06-26 11:07:27.625','snoop@loafle.com','overFlow','000-000-0000','$2a$10$G2bbjoX9.fOnxJx/8DZqPujFYrEQtIEB.f98/8K20XiGWEhwPakZ.',2);
 
-INSERT INTO public."member" (company_name,create_date,email,"name",phone,pw,status_id) VALUES (
+INSERT INTO public."member" (company_name,create_date,email,"name",phone,pw,meta_member_status_id) VALUES (
 'loafle','2017-06-26 11:07:27.625','geekdev@naver.com','geek','000-000-0000','$2a$10$G2bbjoX9.fOnxJx/8DZqPujFYrEQtIEB.f98/8K20XiGWEhwPakZ.',2);
 
-INSERT INTO public.email_auth (auth_confirm_date,create_date,email_auth_key,member_id, status) VALUES (
+INSERT INTO public.email_auth (auth_confirm_date,create_date,email_auth_key,member_id, meta_email_status_id) VALUES (
 '2017-06-27 15:28:48.895','2017-06-26 15:28:48.895','dbseogns1234',1,1);
 
-INSERT INTO public.email_auth (auth_confirm_date,create_date,email_auth_key,member_id, status) VALUES (
+INSERT INTO public.email_auth (auth_confirm_date,create_date,email_auth_key,member_id, meta_email_status_id) VALUES (
 '2017-12-26 15:28:48.895','2017-11-22 12:28:48.895','dbseogns1234',2,1);
 
 INSERT INTO public."domain" (create_date,"name") VALUES (
@@ -933,75 +933,76 @@ INSERT INTO public.api_key (api_key,create_date,domain_id) VALUES (
 INSERT INTO public.api_key (api_key,create_date,domain_id) VALUES (
 '09c8c54f319911e8a41f3222d3c76cf6','2017-06-26 13:02:28.347',4);
 
-INSERT INTO public.probe (authorize_date,cidr,create_date,description,display_name,encryption_key,probe_key,authorize_member_id,domain_id,status, target_count) VALUES (
+INSERT INTO public.probe (authorize_date,cidr,create_date,description,display_name,encryption_key,probe_key,authorize_member_id,domain_id,meta_probe_status_id, target_count) VALUES (
 '2017-08-21 14:48:31.563','192.168.1.0/24','2017-08-21 14:48:31.563','snoop probe','test probe 111111','8c51fa9c5bcc11e7980a080027658d13','899fdd145bcc11e7b611080027658d13',1,1,1,0);
 
-INSERT INTO public.probe (authorize_date,cidr,create_date,description,display_name,encryption_key,probe_key,authorize_member_id,domain_id,status, target_count) VALUES (
+INSERT INTO public.probe (authorize_date,cidr,create_date,description,display_name,encryption_key,probe_key,authorize_member_id,domain_id,meta_probe_status_id, target_count) VALUES (
 '2017-08-21 15:00:09.691','192.168.2.0/24','2017-08-21 15:00:09.691','insanity probe','test probe 22222','f1f72c8d2a814580bb7c4615ec43a6a8','95d8bcdc739741dca74c4a0e489e0774',1,1,1,0);
 
-INSERT INTO public.target (create_date,description,display_name,sensor_count) VALUES (
-'2017-07-27 20:18:09.555','Machine Target','ghost target',0);
-INSERT INTO public.target (create_date,description,display_name,sensor_count) VALUES (
-'2017-07-27 20:18:09.555','OS target','ghost target',0);
-INSERT INTO public.target (create_date,description,display_name,sensor_count) VALUES (
-'2017-07-27 20:18:09.555','Host target','ghost target',0);
-INSERT INTO public.target (create_date,description,display_name,sensor_count) VALUES (
-'2017-07-27 20:18:09.555','Service target','ghost target',0);
-INSERT INTO public.target (create_date,description,display_name,sensor_count) VALUES (
-'2017-07-27 20:18:09.555','OS App target','ghost target',0);
-INSERT INTO public.target (create_date,description,display_name,sensor_count) VALUES (
-'2017-07-27 20:18:09.555','OS Daemon target','ghost target',0);
 
-INSERT INTO public.infra (infra_type,create_date,type_id,probe_id,target_id) VALUES (
-1,'2017-08-21 12:59:10.244',1,1,1);
-INSERT INTO public.infra (infra_type,create_date,type_id,probe_id,target_id) VALUES (
-3,'2017-08-21 13:05:24.883',3,1,2);
-INSERT INTO public.infra (infra_type,create_date,type_id,probe_id,target_id) VALUES (
-2,'2017-08-21 14:20:01.830',2,1,3);
-INSERT INTO public.infra (infra_type,create_date,type_id,probe_id,target_id) VALUES (
-7,'2017-08-21 14:24:26.525',7,1,4);
-INSERT INTO public.infra (infra_type,create_date,type_id,probe_id,target_id) VALUES (
-4,'2017-08-21 14:27:19.474',4,1,5);
-INSERT INTO public.infra (infra_type,create_date,type_id,probe_id,target_id) VALUES (
-5,'2017-08-21 14:28:48.761',5,1,6);
+INSERT INTO public.infra (infra_type,create_date,meta_infra_type_id,probe_id) VALUES (
+1,'2017-08-21 12:59:10.244',1,1);
+INSERT INTO public.infra (infra_type,create_date,meta_infra_type_id,probe_id) VALUES (
+3,'2017-08-21 13:05:24.883',3,1);
+INSERT INTO public.infra (infra_type,create_date,meta_infra_type_id,probe_id) VALUES (
+2,'2017-08-21 14:20:01.830',2,1);
+INSERT INTO public.infra (infra_type,create_date,meta_infra_type_id,probe_id) VALUES (
+7,'2017-08-21 14:24:26.525',7,1);
+INSERT INTO public.infra (infra_type,create_date,meta_infra_type_id,probe_id) VALUES (
+4,'2017-08-21 14:27:19.474',4,1);
+INSERT INTO public.infra (infra_type,create_date,meta_infra_type_id,probe_id) VALUES (
+5,'2017-08-21 14:28:48.761',5,1);
 
 
 INSERT INTO public.infra_machine (meta,id) VALUES (
 'i am a infra machine',1);
 
--- INSERT INTO public.infra_os (meta,id,machine_id,vendor_id) VALUES (
+-- INSERT INTO public.infra_os (meta,id,infra_machine_id,meta_infra_vendor_id) VALUES (
 -- '',2,1,26);
 
-INSERT INTO public.infra_os (meta,id,machine_id,vendor_id) VALUES (
+INSERT INTO public.infra_os (meta,id,infra_machine_id,meta_infra_vendor_id) VALUES (
 '',2,1,24);
 
-INSERT INTO public.infra_host (ip_v4,ip_v6,mac,id,os_id) VALUES (
+INSERT INTO public.infra_host (ip_v4,ip_v6,mac,id,infra_os_id) VALUES (
 '192.168.1.111','fe80::b83c:44a8:5d71:5bc0%3','30-9C-23-15-A3-09',3,2);
 
 -- INSERT INTO public.infra_service (port,port_type,tls_type,id,host_id,vendor_id) VALUES (
 -- 80,'TCP',false,4,3,45);
 
-INSERT INTO public.infra_service (port,port_type,tls_type,id,host_id,vendor_id) VALUES (
+INSERT INTO public.infra_service (port,port_type,tls_type,id,infra_host_id,meta_infra_vendor_id) VALUES (
 80,'TCP',false,4,3,24);
 
-INSERT INTO public.infra_os_application ("name",id,os_id) VALUES (
+INSERT INTO public.infra_os_application ("name",id,infra_os_id) VALUES (
 'Apache',5,2);
 
-INSERT INTO public.infra_os_daemon ("name",id,os_id) VALUES (
+INSERT INTO public.infra_os_daemon ("name",id,infra_os_id) VALUES (
 'Apache',6,2);
 
-insert into public.probe_host (HOST_ID, PROBE_ID) values (3, 1);
+insert into public.probe_host (infra_host_id, PROBE_ID) values (3, 1);
+
+INSERT INTO public.target (create_date,description,display_name,sensor_count, infra_id) VALUES (
+'2017-07-27 20:18:09.555','Machine Target','ghost target',0, 1);
+INSERT INTO public.target (create_date,description,display_name,sensor_count, infra_id) VALUES (
+'2017-07-27 20:18:09.555','OS target','ghost target',0, 2);
+INSERT INTO public.target (create_date,description,display_name,sensor_count, infra_id) VALUES (
+'2017-07-27 20:18:09.555','Host target','ghost target',0, 3);
+INSERT INTO public.target (create_date,description,display_name,sensor_count, infra_id) VALUES (
+'2017-07-27 20:18:09.555','Service target','ghost target',0, 4);
+INSERT INTO public.target (create_date,description,display_name,sensor_count, infra_id) VALUES (
+'2017-07-27 20:18:09.555','OS App target','ghost target',0, 5);
+INSERT INTO public.target (create_date,description,display_name,sensor_count, infra_id) VALUES (
+'2017-07-27 20:18:09.555','OS Daemon target','ghost target',0, 6);
 
 
-INSERT INTO public.sensor (crawler_input_items,create_date,description,crawler_id,status,target_id,item_count,display_name) VALUES (
+INSERT INTO public.sensor (crawler_input_items,create_date,description,meta_crawler_id,meta_sensor_status_id,target_id,item_count,display_name) VALUES (
 NULL,'2017-06-26 20:19:07.009','My sensor 11111',1,1,1,0,'DisplayName1');
-INSERT INTO public.sensor (crawler_input_items,create_date,description,crawler_id,status,target_id,item_count,display_name) VALUES (
+INSERT INTO public.sensor (crawler_input_items,create_date,description,meta_crawler_id,meta_sensor_status_id,target_id,item_count,display_name) VALUES (
 NULL,'2017-06-26 20:19:07.074','My sensor 22222',1,2,1,0,'DisplayName2');
-INSERT INTO public.sensor (crawler_input_items,create_date,description,crawler_id,status,target_id,item_count,display_name) VALUES (
+INSERT INTO public.sensor (crawler_input_items,create_date,description,meta_crawler_id,meta_sensor_status_id,target_id,item_count,display_name) VALUES (
 NULL,'2017-08-28 16:17:05.506','OS_SERVICE-MYSQL_CRAWLER',11,1,4,0,'DisplayName3');
-INSERT INTO public.sensor (crawler_input_items,create_date,description,crawler_id,status,target_id,item_count,display_name) VALUES (
+INSERT INTO public.sensor (crawler_input_items,create_date,description,meta_crawler_id,meta_sensor_status_id,target_id,item_count,display_name) VALUES (
 NULL,'2017-09-05 12:26:02.738','HOST-WMI_CRAWLER',23,1,3,0,'DisplayName4');
-INSERT INTO public.sensor (crawler_input_items,create_date,description,crawler_id,status,target_id,item_count,display_name) VALUES (
+INSERT INTO public.sensor (crawler_input_items,create_date,description,meta_crawler_id,meta_sensor_status_id,target_id,item_count,display_name) VALUES (
 NULL,'2017-09-11 12:26:02.738','SERVICE-JMX_CRAWLER',17,1,4,0,'DisplayName5');
 
 --INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES (
@@ -1233,13 +1234,13 @@ NULL,'2017-09-11 12:26:02.738','SERVICE-JMX_CRAWLER',17,1,4,0,'DisplayName5');
 --INSERT INTO public.sensor_item (create_date,item_id,sensor_id) VALUES (
 --'2017-09-11 12:26:02.738',115,5);
 
-INSERT INTO public.noauth_probe (api_key,create_date,description,temp_probe_key,domain_id,probe_id,status) VALUES (
+INSERT INTO public.noauth_probe (api_key,create_date,description,temp_probe_key,domain_id,probe_id,meta_noauth_probe_status_id) VALUES (
 '52abd6fd57e511e7ac52080027658d13','2017-06-26 12:43:46.877','{"host":{"name":"geek-ubuntu","os":"linux","paltform":"ubuntu","platformFamily":"debian","platformVersion":"","kernelVersion":"4.4.0-93-generic","hostID":"03000200-0400-0500-0006-000700080009"},"network":{"name":"enp3s0","address":"192.168.1.103/24|fe80::36c0:6c3e:6006:dd23/64","gateway":"192.168.1.254","macAddress":"44:8a:5b:f1:f1:f3"}}','1cf2555c57d511e79714080027658d13',1,NULL,3);
 
-INSERT INTO public.noauth_probe (api_key,create_date,description,temp_probe_key,domain_id,probe_id,status) VALUES (
+INSERT INTO public.noauth_probe (api_key,create_date,description,temp_probe_key,domain_id,probe_id,meta_noauth_probe_status_id) VALUES (
 '52abd6fd57e511e7ac52080027658d13','2017-08-11 12:43:46.877','{"host":{"name":"insanity-ubuntu","os":"linux","paltform":"ubuntu","platformFamily":"debian","platformVersion":"","kernelVersion":"4.4.0-93-generic","hostID":"4C4C4544-0044-4A10-8039-C7C04F595031"},"network":{"name":"enp3s0","address":"192.168.1.105/24|fe80::36c0:6c3e:6006:dd23/64","gateway":"192.168.1.254","macAddress":"44:8a:5b:f1:f1:f3"}}','1cf2555c57d511e79714080027658d14',1,NULL,3);
 
-INSERT INTO public.noauth_probe (api_key,create_date,description,temp_probe_key,domain_id,probe_id,status) VALUES (
+INSERT INTO public.noauth_probe (api_key,create_date,description,temp_probe_key,domain_id,probe_id,meta_noauth_probe_status_id) VALUES (
 '52abd6fd57e511e7ac52080027658d13','2017-08-11 12:43:46.877','{"host":{"name":"snoop-ubuntu","os":"linux","paltform":"ubuntu","platformFamily":"debian","platformVersion":"","kernelVersion":"4.4.0-93-generic","hostID":"DE60E4C3-347A-4D38-AEAB-1760471665EA"},"network":{"name":"enp3s0","address":"192.168.1.106/24|fe80::36c0:6c3e:6006:dd23/64","gateway":"192.168.1.254","macAddress":"44:8a:5b:f1:f1:f3"}}','1cf2555c57d511e79714080027658d15',1,NULL,3);
 
 
@@ -1247,205 +1248,205 @@ INSERT INTO public.noauth_probe (api_key,create_date,description,temp_probe_key,
 
 
 
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 1,'2017-08-24 18:33:25.427','Test History 0',1,1,1,5);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 2,'2017-08-24 18:33:25.472','Test History 1',1,1,1,6);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 3,'2017-08-24 18:33:25.493','Test History 2',1,1,2,5);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 4,'2017-08-24 18:33:25.518','Test History 3',1,1,1,3);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 5,'2017-08-24 18:33:25.543','Test History 4',1,1,1,2);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 6,'2017-08-24 18:33:25.563','Test History 5',1,1,1,4);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 7,'2017-08-24 18:33:25.582','Test History 6',1,1,2,3);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 8,'2017-08-24 18:33:25.601','Test History 7',1,1,1,3);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 9,'2017-08-24 18:33:25.621','Test History 8',1,1,2,1);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 10,'2017-08-24 18:33:25.641','Test History 9',1,1,1,3);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 11,'2017-08-24 18:33:25.660','Test History 10',1,1,1,5);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 12,'2017-08-24 18:33:25.674','Test History 11',1,1,1,3);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 13,'2017-08-24 18:33:25.687','Test History 12',1,1,1,5);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 14,'2017-08-24 18:33:25.701','Test History 13',1,1,2,2);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 15,'2017-08-24 18:33:25.714','Test History 14',1,1,2,6);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 16,'2017-08-24 18:33:25.731','Test History 15',1,1,2,5);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 17,'2017-08-24 18:33:25.747','Test History 16',1,1,2,1);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 18,'2017-08-24 18:33:25.762','Test History 17',1,1,2,1);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 19,'2017-08-24 18:33:25.778','Test History 18',1,1,1,4);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 20,'2017-08-24 18:33:25.793','Test History 19',1,1,1,4);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 21,'2017-08-24 18:33:25.808','Test History 20',1,1,2,1);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 22,'2017-08-24 18:33:25.823','Test History 21',1,1,2,1);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 23,'2017-08-24 18:33:25.839','Test History 22',1,1,2,5);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 24,'2017-08-24 18:33:25.854','Test History 23',1,1,1,5);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 25,'2017-08-24 18:33:25.873','Test History 24',1,1,1,4);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 26,'2017-08-24 18:33:25.888','Test History 25',1,1,1,2);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 27,'2017-08-24 18:33:25.902','Test History 26',1,1,2,6);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 28,'2017-08-24 18:33:25.917','Test History 27',1,1,1,5);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 29,'2017-08-24 18:33:25.929','Test History 28',1,1,1,2);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 30,'2017-08-24 18:33:25.942','Test History 29',1,1,1,2);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 31,'2017-08-24 18:33:25.954','Test History 30',1,1,2,4);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 32,'2017-08-24 18:33:25.968','Test History 31',1,1,2,3);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 33,'2017-08-24 18:33:25.981','Test History 32',1,1,1,1);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 34,'2017-08-24 18:33:25.994','Test History 33',1,1,2,2);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 35,'2017-08-24 18:33:26.007','Test History 34',1,1,1,2);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 36,'2017-08-24 18:33:26.021','Test History 35',1,1,2,4);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 37,'2017-08-24 18:33:26.033','Test History 36',1,1,2,4);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 38,'2017-08-24 18:33:26.045','Test History 37',1,1,1,4);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 39,'2017-08-24 18:33:26.059','Test History 38',1,1,2,2);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 40,'2017-08-24 18:33:26.072','Test History 39',1,1,2,6);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 41,'2017-08-24 18:33:26.084','Test History 40',1,1,1,5);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 42,'2017-08-24 18:33:26.097','Test History 41',1,1,1,5);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 43,'2017-08-24 18:33:26.111','Test History 42',1,1,2,4);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 44,'2017-08-24 18:33:26.123','Test History 43',1,1,2,1);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 45,'2017-08-24 18:33:26.135','Test History 44',1,1,2,6);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 46,'2017-08-24 18:33:26.148','Test History 45',1,1,1,5);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 47,'2017-08-24 18:33:26.160','Test History 46',1,1,1,3);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 48,'2017-08-24 18:33:26.173','Test History 47',1,1,2,3);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 49,'2017-08-24 18:33:26.190','Test History 48',1,1,2,2);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 50,'2017-08-24 18:33:26.204','Test History 49',1,1,2,3);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 51,'2017-08-24 18:33:26.219','Test History 50',1,1,2,2);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 52,'2017-08-24 18:33:26.239','Test History 51',1,1,2,6);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 53,'2017-08-24 18:33:26.261','Test History 52',1,1,1,1);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 54,'2017-08-24 18:33:26.560','Test History 53',1,1,1,4);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 55,'2017-08-24 18:33:26.583','Test History 54',1,1,1,2);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 56,'2017-08-24 18:33:26.600','Test History 55',1,1,1,2);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 57,'2017-08-24 18:33:26.617','Test History 56',1,1,1,5);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 58,'2017-08-24 18:33:26.632','Test History 57',1,1,1,4);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 59,'2017-08-24 18:33:26.646','Test History 58',1,1,1,2);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 60,'2017-08-24 18:33:26.661','Test History 59',1,1,1,4);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 61,'2017-08-24 18:33:26.676','Test History 60',1,1,1,5);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 62,'2017-08-24 18:33:26.692','Test History 61',1,1,1,4);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 63,'2017-08-24 18:33:26.708','Test History 62',1,1,1,3);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 64,'2017-08-24 18:33:26.722','Test History 63',1,1,2,3);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 65,'2017-08-24 18:33:26.734','Test History 64',1,1,2,6);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 66,'2017-08-24 18:33:26.747','Test History 65',1,1,1,3);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 67,'2017-08-24 18:33:26.758','Test History 66',1,1,1,2);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 68,'2017-08-24 18:33:26.771','Test History 67',1,1,1,6);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 69,'2017-08-24 18:33:26.784','Test History 68',1,1,2,3);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 70,'2017-08-24 18:33:26.798','Test History 69',1,1,2,2);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 71,'2017-08-24 18:33:26.813','Test History 70',1,1,1,2);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 72,'2017-08-24 18:33:26.834','Test History 71',1,1,2,6);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 73,'2017-08-24 18:33:26.846','Test History 72',1,1,1,4);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 74,'2017-08-24 18:33:26.859','Test History 73',1,1,1,6);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 75,'2017-08-24 18:33:26.873','Test History 74',1,1,2,3);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 76,'2017-08-24 18:33:26.889','Test History 75',1,1,1,4);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 77,'2017-08-24 18:33:26.905','Test History 76',1,1,1,2);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 78,'2017-08-24 18:33:26.921','Test History 77',1,1,2,2);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 79,'2017-08-24 18:33:26.935','Test History 78',1,1,2,1);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 80,'2017-08-24 18:33:26.948','Test History 79',1,1,2,1);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 81,'2017-08-24 18:33:26.961','Test History 80',1,1,2,5);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 82,'2017-08-24 18:33:26.974','Test History 81',1,1,1,2);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 83,'2017-08-24 18:33:26.987','Test History 82',1,1,2,5);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 84,'2017-08-24 18:33:27.000','Test History 83',1,1,1,5);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 85,'2017-08-24 18:33:27.013','Test History 84',1,1,1,1);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 86,'2017-08-24 18:33:27.025','Test History 85',1,1,2,5);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 87,'2017-08-24 18:33:27.038','Test History 86',1,1,1,3);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 88,'2017-08-24 18:33:27.052','Test History 87',1,1,2,3);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 89,'2017-08-24 18:33:27.064','Test History 88',1,1,2,3);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 90,'2017-08-24 18:33:27.076','Test History 89',1,1,2,2);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 91,'2017-08-24 18:33:27.090','Test History 90',1,1,2,6);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 92,'2017-08-24 18:33:27.106','Test History 91',1,1,2,6);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 93,'2017-08-24 18:33:27.120','Test History 92',1,1,1,6);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 94,'2017-08-24 18:33:27.134','Test History 93',1,1,1,1);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 95,'2017-08-24 18:33:27.149','Test History 94',1,1,1,4);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 96,'2017-08-24 18:33:27.164','Test History 95',1,1,2,6);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 97,'2017-08-24 18:33:27.177','Test History 96',1,1,2,2);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 98,'2017-08-24 18:33:27.191','Test History 97',1,1,1,1);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 99,'2017-08-24 18:33:27.204','Test History 98',1,1,2,5);
-INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,type_id) VALUES (
+INSERT INTO public.history (id,create_date,message,domain_id,member_id,probe_id,meta_history_type_id) VALUES (
 100,'2017-08-24 18:33:27.217','Test History 99',1,1,1,3);
 
 
@@ -1511,11 +1512,11 @@ INSERT INTO public.notification (id,confirm_date,create_date,message,title,membe
 30,NULL,'2017-08-29 16:39:18.143','Message29','Title29',1, '/metrics');
 
 
-INSERT INTO public.auth_crawler (auth_json,create_date,crawler_id,target_id) VALUES (
+INSERT INTO public.auth_crawler (auth_json,create_date,meta_crawler_id,target_id) VALUES (
 '{"Community":"public"}','2017-09-08 18:31:05.126',20,5);
-INSERT INTO public.auth_crawler (auth_json,create_date,crawler_id,target_id) VALUES (
+INSERT INTO public.auth_crawler (auth_json,create_date,meta_crawler_id,target_id) VALUES (
 '{"ID":"administrator","PassWord":"dbseogns18"}','2017-09-08 18:31:18.581',23,3);
-INSERT INTO public.auth_crawler (auth_json,create_date,crawler_id,target_id) VALUES (
+INSERT INTO public.auth_crawler (auth_json,create_date,meta_crawler_id,target_id) VALUES (
 '{"DB Name":"test","ID":"docker","PassWord":"qwer5795QWER"}','2017-09-08 18:31:37.206',11,4);
-INSERT INTO public.auth_crawler (auth_json,create_date,crawler_id,target_id) VALUES (
+INSERT INTO public.auth_crawler (auth_json,create_date,meta_crawler_id,target_id) VALUES (
 '{"ID":"jmxxuser","PassWord":"tomcat"}','2017-09-12 15:11:47.875',17,4);
\ No newline at end of file
diff --git a/src/test/java/com/loafle/overflow/central/module/domain/dao/DomainMemberDAOTest.java b/src/test/java/com/loafle/overflow/central/module/domain/dao/DomainMemberDAOTest.java
new file mode 100644
index 0000000..fab85f6
--- /dev/null
+++ b/src/test/java/com/loafle/overflow/central/module/domain/dao/DomainMemberDAOTest.java
@@ -0,0 +1,42 @@
+package com.loafle.overflow.central.module.domain.dao;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.util.List;
+
+import com.loafle.overflow.central.spring.AppConfigTest;
+import com.loafle.overflow.model.domain.Domain;
+import com.loafle.overflow.model.member.Member;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * Created by snoop on 17. 9. 14.
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = {AppConfigTest.class})
+public class DomainMemberDAOTest {
+
+    @Autowired
+    private DomainMemberDAO domainMemberDAO;
+
+    @Test
+    public void findDomainByMemberEmail() throws Exception {
+
+        Domain domain = this.domainMemberDAO.findDomainByMemberEmail("overflow@loafle.com");
+
+        assertNotNull(domain);
+    }
+
+    @Test
+    public void findAllMemberByDomainId() throws Exception {
+
+        List<Member> members = this.domainMemberDAO.findAllMemberByDomainId(Long.valueOf(1));
+
+        assertNotNull(members);
+    }
+}
diff --git a/src/test/java/com/loafle/overflow/central/module/infra/dao/InfraDAOTest.java b/src/test/java/com/loafle/overflow/central/module/infra/dao/InfraDAOTest.java
index ff20e3b..f3a7a6b 100644
--- a/src/test/java/com/loafle/overflow/central/module/infra/dao/InfraDAOTest.java
+++ b/src/test/java/com/loafle/overflow/central/module/infra/dao/InfraDAOTest.java
@@ -23,7 +23,7 @@ public class InfraDAOTest {
     private InfraDAO infraDAO;
 
     @Test
-    public void findAllByProbeList() throws Exception {
+    public void findAllTargetByProbeIn() throws Exception {
 
         List<Probe> probes = new ArrayList<>();
 
@@ -37,4 +37,4 @@ public class InfraDAOTest {
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/com/loafle/overflow/central/module/meta/dao/MetaSensorDisplayMappingDAOTest.java b/src/test/java/com/loafle/overflow/central/module/meta/dao/MetaSensorDisplayMappingDAOTest.java
new file mode 100644
index 0000000..a6b1b36
--- /dev/null
+++ b/src/test/java/com/loafle/overflow/central/module/meta/dao/MetaSensorDisplayMappingDAOTest.java
@@ -0,0 +1,34 @@
+package com.loafle.overflow.central.module.meta.dao;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.util.List;
+
+import com.loafle.overflow.central.spring.AppConfigTest;
+import com.loafle.overflow.model.meta.MetaSensorItemKey;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * Created by snoop on 17. 9. 14.
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = {AppConfigTest.class})
+public class MetaSensorDisplayMappingDAOTest {
+
+    @Autowired
+    private MetaSensorDisplayMappingDAO metaSensorDisplayMappingDAO;
+
+    @Test
+    public void findAllMetaSensorItemKeyByMetaSensorDisplayItemId() throws Exception {
+
+        List<MetaSensorItemKey> metaSensorItemKeys = this.metaSensorDisplayMappingDAO.findAllMetaSensorItemKeyByMetaSensorDisplayItemId(Long.valueOf(1));
+
+        assertNotNull(metaSensorItemKeys);
+    }
+
+}
diff --git a/src/test/java/com/loafle/overflow/central/module/sensor/dao/SensorItemDependencyDAOTest.java b/src/test/java/com/loafle/overflow/central/module/sensor/dao/SensorItemDependencyDAOTest.java
new file mode 100644
index 0000000..19684c6
--- /dev/null
+++ b/src/test/java/com/loafle/overflow/central/module/sensor/dao/SensorItemDependencyDAOTest.java
@@ -0,0 +1,35 @@
+package com.loafle.overflow.central.module.sensor.dao;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.util.List;
+
+import com.loafle.overflow.central.spring.AppConfigTest;
+import com.loafle.overflow.model.meta.MetaSensorItemKey;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * Created by snoop on 17. 9. 14.
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = { AppConfigTest.class })
+public class SensorItemDependencyDAOTest {
+
+  @Autowired
+  private SensorItemDependencyDAO sensorItemDependencyDAO;
+
+  @Test
+  public void findAllMetaSensorItemKeyByMetaSensorDisplayItemId() throws Exception {
+
+    List<MetaSensorItemKey> metaSensorItemKeys = this.sensorItemDependencyDAO
+        .findAllMetaSensorItemKeyByMetaSensorDisplayItemId(Long.valueOf(1));
+
+    assertNotNull(metaSensorItemKeys);
+  }
+
+}