diff --git a/tools/enums.go b/tools/enums.go
index e363e44..14a1c78 100644
--- a/tools/enums.go
+++ b/tools/enums.go
@@ -27,11 +27,6 @@ const (
 	WORKSPACE_HISTORY
 	ORDER
 	PURCHASE_RESOURCE
-	ADMIRALTY_SOURCE
-	ADMIRALTY_TARGET
-	ADMIRALTY_SECRET
-	ADMIRALTY_KUBECONFIG
-	ADMIRALTY_NODES
 	LIVE_DATACENTER
 	LIVE_STORAGE
 	BILL
@@ -64,21 +59,6 @@ var DATACENTERAPI = func() string {
 var PURCHASEAPI = func() string {
 	return config.GetConfig().InternalCatalogAPI + "/purchase"
 }
-var ADMIRALTY_SOURCEAPI = func() string {
-	return config.GetConfig().InternalDatacenterAPI + "/admiralty/source"
-}
-var ADMIRALTY_TARGETAPI = func() string {
-	return config.GetConfig().InternalDatacenterAPI + "/admiralty/target"
-}
-var ADMIRALTY_SECRETAPI = func() string {
-	return config.GetConfig().InternalDatacenterAPI + "/admiralty/secret"
-}
-var ADMIRALTY_KUBECONFIGAPI = func() string {
-	return config.GetConfig().InternalDatacenterAPI + "/admiralty/kubeconfig"
-}
-var ADMIRALTY_NODESAPI = func() string {
-	return config.GetConfig().InternalDatacenterAPI + "/admiralty/node"
-}
 var MINIO = func() string {
 	return config.GetConfig().InternalDatacenterAPI + "/minio"
 }
@@ -102,11 +82,6 @@ var InnerDefaultAPI = [...]func() string{
 	NOAPI,
 	NOAPI,
 	PURCHASEAPI,
-	ADMIRALTY_SOURCEAPI,
-	ADMIRALTY_TARGETAPI,
-	ADMIRALTY_SECRETAPI,
-	ADMIRALTY_KUBECONFIGAPI,
-	ADMIRALTY_NODESAPI,
 	DATACENTERAPI,
 	DATACENTERAPI,
 	NOAPI,
@@ -134,11 +109,6 @@ var Str = [...]string{
 	"workspace_history",
 	"order",
 	"purchase_resource",
-	"admiralty_source",
-	"admiralty_target",
-	"admiralty_secret",
-	"admiralty_kubeconfig",
-	"admiralty_node",
 	"live_datacenter",
 	"live_storage",
 	"bill",
@@ -179,7 +149,7 @@ func (d DataType) EnumIndex() int {
 func DataTypeList() []DataType {
 	return []DataType{DATA_RESOURCE, PROCESSING_RESOURCE, STORAGE_RESOURCE, COMPUTE_RESOURCE, WORKFLOW_RESOURCE,
 		WORKFLOW, WORKFLOW_EXECUTION, WORKSPACE, PEER, COLLABORATIVE_AREA, RULE, BOOKING, WORKFLOW_HISTORY, WORKSPACE_HISTORY,
-		ORDER, PURCHASE_RESOURCE, ADMIRALTY_SOURCE, ADMIRALTY_TARGET, ADMIRALTY_SECRET, ADMIRALTY_KUBECONFIG, ADMIRALTY_NODES,
+		ORDER, PURCHASE_RESOURCE,
 		LIVE_DATACENTER, LIVE_STORAGE, BILL, NATIVE_TOOL}
 }
 
diff --git a/tools/kubernetes.go b/tools/kubernetes.go
index d1381ba..cad5b03 100644
--- a/tools/kubernetes.go
+++ b/tools/kubernetes.go
@@ -35,15 +35,6 @@ type KubernetesService struct {
 }
 
 func NewDynamicClient(host string, ca string, cert string, data string) (*dynamic.DynamicClient, error) {
-	/*config := &rest.Config{
-		Host: conf.GetConfig().KubeHost + ":" + conf.GetConfig().KubePort,
-		TLSClientConfig: rest.TLSClientConfig{
-			CAData:   []byte(conf.GetConfig().KubeCA),
-			CertData: []byte(conf.GetConfig().KubeCert),
-			KeyData:  []byte(conf.GetConfig().KubeData),
-		},
-	}*/
-
 	config := &rest.Config{
 		Host: host,
 		TLSClientConfig: rest.TLSClientConfig{
diff --git a/tools/nats_caller.go b/tools/nats_caller.go
index 26ec318..2cfe5bc 100644
--- a/tools/nats_caller.go
+++ b/tools/nats_caller.go
@@ -26,7 +26,7 @@ type NATSResponse struct {
 type NATSMethod int
 
 var meths = []string{"remove execution", "create execution", "discovery",
-	"workflow event", "create resource", "remove resource",
+	"workflow event", "argo kube event", "create resource", "remove resource",
 	"propalgation event", "search event",
 }
 
@@ -34,7 +34,9 @@ const (
 	REMOVE_EXECUTION NATSMethod = iota
 	CREATE_EXECTUTION
 	DISCOVERY
+
 	WORKFLOW_EVENT
+	ARGO_KUBE_EVENT
 
 	CREATE_RESOURCE
 	REMOVE_RESOURCE
@@ -49,7 +51,7 @@ func (n NATSMethod) String() string {
 
 // NameToMethod returns the NATSMethod enum value from a string
 func NameToMethod(name string) NATSMethod {
-	for _, v := range [...]NATSMethod{REMOVE_EXECUTION, CREATE_EXECTUTION, DISCOVERY, WORKFLOW_EVENT,
+	for _, v := range [...]NATSMethod{REMOVE_EXECUTION, CREATE_EXECTUTION, DISCOVERY, WORKFLOW_EVENT, ARGO_KUBE_EVENT,
 		CREATE_RESOURCE, REMOVE_RESOURCE, PROPALGATION_EVENT, SEARCH_EVENT} {
 		if strings.Contains(strings.ToLower(v.String()), strings.ToLower(name)) {
 			return v