diff --git a/...src/main/java/org/broadleafcommerce/core/payment/service/CompositePaymentServiceImpl.java b/...src/main/java/org/broadleafcommerce/core/payment/service/CompositePaymentServiceImpl.java
@@ -16,9 +16,8 @@
 
 package org.broadleafcommerce.core.payment.service;
 
-import java.util.Map;
-
 import javax.annotation.Resource;
+import java.util.Map;
 
 import org.broadleafcommerce.core.order.domain.Order;
 import org.broadleafcommerce.core.payment.domain.PaymentInfo;
@@ -75,4 +74,11 @@ public CompositePaymentResponse executePayment(Order order) throws PaymentExcept
         return executePayment(order, null);
     }
 
+    public SequenceProcessor getPaymentWorkflow() {
+        return paymentWorkflow;
+    }
+
+    public void setPaymentWorkflow(SequenceProcessor paymentWorkflow) {
+        this.paymentWorkflow = paymentWorkflow;
+    }
 }
diff --git a/...mework/src/main/java/org/broadleafcommerce/core/payment/service/type/PaymentInfoType.java b/...mework/src/main/java/org/broadleafcommerce/core/payment/service/type/PaymentInfoType.java
@@ -16,6 +16,8 @@
 
 package org.broadleafcommerce.core.payment.service.type;
 
+import org.broadleafcommerce.common.BroadleafEnumerationType;
+
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
@@ -37,6 +39,7 @@ public class PaymentInfoType implements Serializable, BroadleafEnumerationType {
     public static final PaymentInfoType GIFT_CARD = new PaymentInfoType("GIFT_CARD", "Gift Card");
     public static final PaymentInfoType CREDIT_CARD = new PaymentInfoType("CREDIT_CARD", "Credit Card");
     public static final PaymentInfoType BANK_ACCOUNT = new PaymentInfoType("BANK_ACCOUNT", "Bank Account");
+    public static final PaymentInfoType PAYPAL = new PaymentInfoType("PAYPAL", "PayPal");
 
     public static PaymentInfoType getInstance(final String type) {
         return TYPES.get(type);

diff --git a/core/broadleaf-framework/src/main/resources/bl-framework-applicationContext-workflow.xml b/core/broadleaf-framework/src/main/resources/bl-framework-applicationContext-workflow.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:aop="http://www.springframework.org/schema/aop"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+           http://www.springframework.org/schema/aop
+          http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
 
     <bean id="blTaxModule" class="org.broadleafcommerce.core.pricing.service.module.SimpleTaxModule">
 		<property name="factor" value="0.05"/>
@@ -121,5 +124,12 @@
 		</property>
 		<property name="defaultErrorHandler" ref="blDefaultErrorHandler"/>
 	</bean>
+
+    <aop:config>
+        <aop:aspect id="qosAspect" ref="blServiceMonitor">
+            <aop:pointcut id="qosMethod" expression="execution(* org.broadleafcommerce.common.vendor.service.monitor.ServiceStatusDetectable.process(..))"/>
+            <aop:around method="checkServiceAOP" pointcut-ref="qosMethod"/>
+        </aop:aspect>
+    </aop:config>
 
 </beans>
diff --git a/core/broadleaf-instrument/pom.xml b/core/broadleaf-instrument/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>core</artifactId>
 		<groupId>org.broadleafcommerce</groupId>
-		<version>1.6.0-M2-SNAPSHOT</version>
+		<version>1.6.0-PAYPAL-SNAPSHOT</version>
 	</parent>
 	<artifactId>broadleaf-instrument</artifactId>
 	<name>BroadleafCommerce Instrument</name>

diff --git a/core/broadleaf-profile-web/pom.xml b/core/broadleaf-profile-web/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>core</artifactId>
 		<groupId>org.broadleafcommerce</groupId>
-		<version>1.6.0-M2-SNAPSHOT</version>
+		<version>1.6.0-PAYPAL-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>broadleaf-profile-web</artifactId>

diff --git a/core/broadleaf-profile/pom.xml b/core/broadleaf-profile/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>core</artifactId>
 		<groupId>org.broadleafcommerce</groupId>
-		<version>1.6.0-M2-SNAPSHOT</version>
+		<version>1.6.0-PAYPAL-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>broadleaf-profile</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>broadleaf</artifactId>
 		<groupId>org.broadleafcommerce</groupId>
-		<version>1.6.0-M2-SNAPSHOT</version>
+		<version>1.6.0-PAYPAL-SNAPSHOT</version>
 	</parent>
 	<artifactId>core</artifactId>
 	<packaging>pom</packaging>

diff --git a/integration/pom.xml b/integration/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>broadleaf</artifactId>
         <groupId>org.broadleafcommerce</groupId>
-        <version>1.6.0-M2-SNAPSHOT</version>
+        <version>1.6.0-PAYPAL-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>integration</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     <artifactId>broadleaf</artifactId>
     <packaging>pom</packaging>
     <name>BroadleafCommerce</name>
-    <version>1.6.0-M2-SNAPSHOT</version>
+    <version>1.6.0-PAYPAL-SNAPSHOT</version>
     <description>BroadleafCommerce Top Level Project</description>
     <url>http://www.broadleafcommerce.org</url>
     <licenses>