Index: ccr/trunk/p/GPLACTORS.m
===================================================================
--- ccr/trunk/p/GPLACTORS.m	(revision 66)
+++ ccr/trunk/p/GPLACTORS.m	(revision 67)
@@ -143,18 +143,21 @@
      S AMAP=$NA(^TMP($J,"AMAP"))
      S @AMAP@("ACTOROBJECTID")=AOID ;ACTOR OBJECT ID
-     S @AMAP@("ACTORGIVENNAME")=""
-     S @AMAP@("ACTORMIDDLENAME")=""
-     S @AMAP@("ACTORFAMILYNAME")=""
-     S @AMAP@("ACTORSPECIALITY")=""
-     S @AMAP@("ACTORADDRESSTYPE")=""
-     S @AMAP@("ACTORADDRESSLINE1")=""
-     S @AMAP@("ACTORADDRESSLINE2")=""
-     S @AMAP@("ACTORADDRESSCITY")=""
-     S @AMAP@("ACTORADDRESSSTATE")=""
-     S @AMAP@("ACTORADDRESSZIPCODE")=""
-     S @AMAP@("ACTORTELEPHONE")=""
-     S @AMAP@("ACTORTELEPHONETYPE")=""
-     S @AMAP@("ACTOREMAIL")=""
-     S @AMAP@("ACTORADDRESSSOURCEID")=""
+     S @AMAP@("ACTORGIVENNAME")=$$GIVEN^CCRVA200(AIEN)
+     S @AMAP@("ACTORMIDDLENAME")=$$MIDDLE^CCRVA200(AIEN)
+     S @AMAP@("ACTORFAMILYNAME")=$$FAMILY^CCRVA200(AIEN)
+	 S @AMAP@("ACTORTITLE")=$$TITLE^CCRVA200(AIEN)
+	 S @AMAP@("IDTYPE")=$P($$NPI^CCRVA200(AIEN),U,1)
+	 S @AMAP@("ID")=$P($$NPI^CCRVA200(AIEN),U,2)
+	 S @AMAP@("IDDESC")=$P($$NPI^CCRVA200(AIEN),U,3)
+     S @AMAP@("ACTORSPECIALITY")=$$SPEC^CCRVA200(AIEN)
+     S @AMAP@("ACTORADDRESSTYPE")=$$ADDTYPE^CCRVA200(AIEN)
+     S @AMAP@("ACTORADDRESSLINE1")=$$ADDLINE1^CCRVA200(AIEN)
+     S @AMAP@("ACTORADDRESSCITY")=$$CITY^CCRVA200(AIEN)
+     S @AMAP@("ACTORADDRESSSTATE")=$$STATE^CCRVA200(AIEN)
+     S @AMAP@("ACTORPOSTALCODE")=$$POSTCODE^CCRVA200(AIEN)
+     S @AMAP@("ACTORTELEPHONE")=$$TEL^CCRVA200(AIEN)
+     S @AMAP@("ACTORTELEPHONETYPE")=$$TELTYPE^CCRVA200(AIEN)
+     S @AMAP@("ACTOREMAIL")=$$EMAIL^CCRVA200(AIEN)
+     S @AMAP@("ACTORADDRESSSOURCEID")="ACTORSYSTEM_1"
      D MAP^GPLXPATH(INXML,AMAP,OUTXML) ; MAP THE VARIABLE
      Q