diff --git a/data/workflows/AD.xml b/data/workflows/AD.xml
index 1457201..f7b960c 100644
--- a/data/workflows/AD.xml
+++ b/data/workflows/AD.xml
@@ -1,11 +1,11 @@
 <workflow>
-	<rule match="$.services.activeDirectories[?(@.domain)].units[?(not @.isMaster)]">
+	<rule match="$.services[?(@.type == 'activeDirectory' and @.domain)].units[?(not @.isMaster)]">
 		<set path="domain">
 			<select path="::domain"/>
 		</set>
 	</rule>
 
-	<rule match="$.services.activeDirectories[*].units[?(@.state.hostname and not @.state.instanceName)]">
+	<rule match="$.services[?(@.type == 'activeDirectory')].units[?(@.state.hostname and not @.state.instanceName)]">
 		<report entity="unit">
 			<parameter name="id"><select path="id"/></parameter>
 			<parameter name="text">Creating instance <select path="state.hostname"/> (<select path="name"/>)</parameter>
@@ -40,7 +40,7 @@
 		</update-cf-stack>
 	</rule>
 
-	<rule match="$.services.activeDirectories[*].units[?(@.state.instanceName and @.adminPassword and @.adminPassword != @.state.adminPassword)]">
+	<rule match="$.services[?(@.type == 'activeDirectory')].units[?(@.state.instanceName and @.adminPassword and @.adminPassword != @.state.adminPassword)]">
 		<send-command template="SetPassword">
 			<parameter name="unit">
 				<select path="id"/>
@@ -63,7 +63,7 @@
 		</send-command>
 	</rule>
 
-	<rule match="$.services.activeDirectories[?(@.adminPassword and @.adminPassword != @.state.domainAdminPassword)].units[?(@.state.instanceName and @.isMaster)]">
+	<rule match="$.services[?(@.type == 'activeDirectory' and @.adminPassword and @.adminPassword != @.state.domainAdminPassword)].units[?(@.state.instanceName and @.isMaster)]">
 		<send-command template="SetPassword">
 			<parameter name="unit">
 				<select path="id"/>
@@ -86,7 +86,7 @@
 		</send-command>
 	</rule>
 
-	<rule match="$.services.activeDirectories[?(@.state.primaryDc is None)].units[?(@.state.instanceName and @.isMaster)]">
+	<rule match="$.services.activeDirectories[?(@.type == 'activeDirectory' and @.state.primaryDc is None)].units[?(@.state.instanceName and @.isMaster)]">
 		<report entity="unit">
 			<parameter name="id"><select path="id"/></parameter>
 			<parameter name="text">Creating Primary Domain Controller on unit <select path="state.hostname"/> (<select path="name"/>)</parameter>
@@ -118,7 +118,7 @@
 		</send-command>
 	</rule>
 
-	<rule match="$.services.activeDirectories[?(@.state.primaryDc and not @.state.primaryDcIp)].units[?(@.state.instanceName and @.isMaster)]">
+	<rule match="$.services[?(@.type == 'activeDirectory' and @.state.primaryDc and not @.state.primaryDcIp)].units[?(@.state.instanceName and @.isMaster)]">
 		<send-command template="AskDnsIp" result="ip">
 			<parameter name="unit">
 				<select path="id"/>
@@ -142,7 +142,7 @@
 			<select path="::"/>
 		</set>
 		<rule>
-			<parameter name="match">/$.services.activeDirectories[?(@.domain == '<select path="domain"/>' and @.state.primaryDcIp)]</parameter>
+			<parameter name="match">/$.services[?(@.type == 'activeDirectory' and @.domain == '<select path="domain"/>' and @.state.primaryDcIp)]</parameter>
 
 			<send-command template="JoinDomain">
 				<parameter name="unit">
@@ -181,7 +181,7 @@
 	</rule>
 
 
-	<rule match="$.services.activeDirectories[*].units[?(@.state.domain and not @.isMaster and not @.state.installed)]">
+	<rule match="$.services[?(@.type == 'activeDirectory')].units[?(@.state.domain and not @.isMaster and not @.state.installed)]">
 		<report entity="unit">
 			<parameter name="id"><select path="id"/></parameter>
 			<parameter name="text">Creating Secondary Domain Controller on unit <select path="state.hostname"/> (<select path="name"/>)</parameter>
diff --git a/data/workflows/AspNetApps.xml b/data/workflows/AspNetApps.xml
index f10b2ca..c44fdf0 100644
--- a/data/workflows/AspNetApps.xml
+++ b/data/workflows/AspNetApps.xml
@@ -1,11 +1,11 @@
 <workflow>
-	<rule match="$.services.webServers,aspNetApps,webServerFarms,aspNetAppFarms[?(@.domain)].units[*]">
+	<rule match="$.services[?(@.type in ('webServer', 'aspNetApp', 'webServerFarm', 'aspNetAppFarm') and @.domain)].units[*]">
 		<set path="domain">
 			<select path="::domain"/>
 		</set>
 	</rule>
 
-	<rule match="$.services.webServers,aspNetApps,webServerFarms,aspNetAppFarms[*].units[?(@.state.hostname and not @.state.instanceName)]">
+	<rule match="$.services[?(@.type in ('webServer', 'aspNetApp', 'webServerFarm', 'aspNetAppFarm'))].units[?(@.state.hostname and not @.state.instanceName)]">
 		<report entity="unit">
 			<parameter name="id"><select path="id"/></parameter>
 			<parameter name="text">Creating instance <select path="state.hostname"/> (<select path="name"/>)</parameter>
@@ -40,7 +40,7 @@
 		</update-cf-stack>
 	</rule>
 
-	<rule match="$.services.webServerFarms,aspNetAppFarms[*].units[?(@.state.hostname and not @.state.registeredWithLB)]">
+	<rule match="$.services[?(@.type in ('webServerFarm', 'aspNetAppFarm'))].units[?(@.state.hostname and not @.state.registeredWithLB)]">
 		<update-cf-stack template="LoadBalancer" result="outputs">
 			<parameter name="mappings">
 				<map>
@@ -56,7 +56,7 @@
 		</update-cf-stack>
 	</rule>
 
-	<rule match="$.services.webServers,aspNetApps,webServerFarms,aspNetAppFarms[?(@.adminPassword and @.adminPassword != @.state.adminPassword)].units[?(@.state.instanceName)]">
+	<rule match="$.services[?(@.type in ('webServer', 'aspNetApp', 'webServerFarm', 'aspNetAppFarm') and @.adminPassword and @.adminPassword != @.state.adminPassword)].units[?(@.state.instanceName)]">
 		<send-command template="SetPassword">
 			<parameter name="unit">
 				<select path="id"/>
@@ -80,7 +80,7 @@
 	</rule>
 
 
-	<rule match="$.services.webServers,aspNetApps,webServerFarms,aspNetAppFarms[*].units[?(@.state.instanceName and not @.state.iisInstalled)]">
+	<rule match="$.services[?(@.type in ('webServer', 'aspNetApp', 'webServerFarm', 'aspNetAppFarm'))].units[?(@.state.instanceName and not @.state.iisInstalled)]">
 		<report entity="unit">
 			<parameter name="id"><select path="id"/></parameter>
 			<parameter name="text">Creating IIS Web Server on unit <select path="state.hostname"/> (<select path="name"/>)</parameter>
@@ -102,7 +102,7 @@
 		</send-command>
 	</rule>
 
-	<rule match="$.services.aspNetApps,aspNetAppFarms[*].units[?(@.state.iisInstalled and not @.state.webAppDeployed)]">
+	<rule match="$.services[?(@.type in ('aspNetApp', 'aspNetAppFarm'))].units[?(@.state.iisInstalled and not @.state.webAppDeployed)]">
 		<report entity="unit">
 			<parameter name="id"><select path="id"/></parameter>
 			<parameter name="text">Deploying WebApp <select path="::name"/> on unit <select path="state.hostname"/> (<select path="name"/>)</parameter>
diff --git a/data/workflows/Common.xml b/data/workflows/Common.xml
index b3da0aa..561422c 100644
--- a/data/workflows/Common.xml
+++ b/data/workflows/Common.xml
@@ -1,6 +1,6 @@
 <workflow>
 
-	<rule match="$.services[*][*].units[?(@.state.hostname is None)]">
+	<rule match="$.services[*].units[?(@.state.hostname is None)]">
 		<set path="state.hostname">
 			<generate-hostname>
 				<parameter name="pattern"><select path="::unitNamingPattern"/></parameter>
@@ -10,7 +10,7 @@
 	</rule>
 
 	<rule match="$[?(not @.state.deleted)]">
-		<rule match="$.services[*][*].units[*]">
+		<rule match="$.services[*].units[*]">
 			<empty>
 				<delete-cf-stack>
 					<success>
diff --git a/data/workflows/ExternalAD.xml.example b/data/workflows/ExternalAD.xml.example
index 082bde8..5cb172b 100644
--- a/data/workflows/ExternalAD.xml.example
+++ b/data/workflows/ExternalAD.xml.example
@@ -1,5 +1,5 @@
 <workflow>
-	<rule match="$.services[*][?(@.availabilityZone)].units[?(@.state.instanceName and @.state.hostname and not @.domain)]">
+	<rule match="$.services[?(@.type != 'activeDirectory' and @.availabilityZone)].units[?(@.state.instanceName and @.state.hostname and not @.domain)]">
         <set path="#externalADmap">
             <map>