diff --git a/src/CRUD/CRUD.go b/src/CRUD/CRUD.go
index dff3e0b..6d728a1 100644
--- a/src/CRUD/CRUD.go
+++ b/src/CRUD/CRUD.go
@@ -24,10 +24,8 @@ const (
 
 var auth string
 
-func makeRequest(requestType, mac, messageType, source, transId, dest, contentType, payload string, client *http.Client) {
+func makeRequest(requestType, messageType, source, transId, dest, contentType, payload string, client *http.Client) {
 
-	var deviceName string
-	deviceName = fmt.Sprintf("mac:%s/%s", mac, dest)
 	
 	headers := make(map[string]string)
 	
@@ -40,9 +38,7 @@ func makeRequest(requestType, mac, messageType, source, transId, dest, contentTy
 		headers[ContentHeaderName]= contentType
 		headers[TransIdHeaderName]= transId
 		headers[SourceHeaderName]= source
-		headers[DestHeaderName]= deviceName
-		
-		fmt.Printf("Received Request %s, %s \n", messageType, PathURL)
+		headers[DestHeaderName]= dest
 		
 		req, err = http.NewRequest(requestType, PathURL, bytes.NewBufferString(payload))
 	}
@@ -108,9 +104,8 @@ func main() {
 	auth = "Bearer " + os.Getenv("WEBPA_SAT")
 
 	var maxConnReuse uint
-	var requestType, mac, messageType, source, dest, contentType, transId, payload string
+	var requestType, messageType, source, dest, contentType, transId, payload string
 
-	flag.StringVar(&mac, "mac", "", "device-id")
 	flag.StringVar(&messageType, "messageType", "", "type of the request to send")
 	flag.StringVar(&payload, "payload", "", "the payload to send to apply")
 	flag.StringVar(&source, "source", "", "source value for CRUD operations")
@@ -145,6 +140,6 @@ func main() {
 		},
 	}
 
-	makeRequest(requestType, mac, messageType, source, transId, dest, contentType, payload, client)
+	makeRequest(requestType, messageType, source, transId, dest, contentType, payload, client)
 
 }
diff --git a/src/CRUD/README.md b/src/CRUD/README.md
index e0f4f09..6c42be5 100644
--- a/src/CRUD/README.md
+++ b/src/CRUD/README.md
@@ -6,7 +6,7 @@ To build with just go:
 export GOPATH=`pwd`
 cd src
 glide install
-cd src/CRUD
+cd CRUD
 go build
 
 ```
@@ -18,26 +18,25 @@ export WEBPA_SAT=<SAT_Token>
 
 ### Create
 ```
-./CRUD -messageType=Create -payload='{ "expires" : 12345}' -mac=14cfe2142XXX -source="tag-update" -dest="parodus/tag/test1" -transId="bd4ad2d1-5c9c-486f-8e25-52c242b38" -contentType="application/json"
-
+./CRUD -messageType=5 -source="tag-update" -dest="mac:14cfe21421xx/parodus/tag/test1" -transId="bd4ad2d1-5c9c-486f-8e25-52c242b38" -contentType="application/json" -payload='{ "expires" : 12345}'
 ```
 
 ### Retrieve
 ```
-./CRUD -messageType=Retrieve -mac=14cfe2142XXX -source="tag-update" -dest="parodus/tag/test1" -transId="bd4ad2d1-5c9c-486f-8e25-52c242b38" -contentType="application/json"
+./CRUD -messageType=6 -source="tag-update" -dest="mac:14cfe21421xx/parodus/tag/test1" -transId="bd4ad2d1-5c9c-486f-8e25-52c242b38" -contentType="application/json"
 
 ```
 
 
 ### Update
 ```
-./CRUD -messageType=Update -payload='{ "expires" : 12345}' -mac=14cfe2142XXX -source="tag-update" -dest="parodus/tag/test1" -transId="bd4ad2d1-5c9c-486f-8e25-52c242b38" -contentType="application/json"
+./CRUD -messageType=7 -source="tag-update" -dest="mac:14cfe21421xx/parodus/tag/test1" -transId="bd4ad2d1-5c9c-486f-8e25-52c242b38" -contentType="application/json" -payload='{ "expires" : 12345}'
 
 ```
 
 ### Delete
 ```
-./CRUD -messageType=Delete -mac=14cfe2142XXX -source="tag-update" -dest="parodus/tag/test1" -transId="bd4ad2d1-5c9c-486f-8e25-52c242b38" -contentType="application/json"
+./CRUD -messageType=8 -source="tag-update" -dest="mac:14cfe21421xx/parodus/tag/test1" -transId="bd4ad2d1-5c9c-486f-8e25-52c242b38" -contentType="application/json"
 
 ```
 
diff --git a/src/glide.yaml b/src/glide.yaml
new file mode 100644
index 0000000..4e7325c
--- /dev/null
+++ b/src/glide.yaml
@@ -0,0 +1,5 @@
+package: .
+import:
+- package: github.com/Comcast/webpa-common
+  version: c936e1b4ec39c3bb796d28aa11a1bd97dac4e05d
+