diff --git a/api/src/main/java/org/openmrs/module/labonfhir/LabOnFhirActivator.java b/api/src/main/java/org/openmrs/module/labonfhir/LabOnFhirActivator.java
index d5d9c31..0610f51 100644
--- a/api/src/main/java/org/openmrs/module/labonfhir/LabOnFhirActivator.java
+++ b/api/src/main/java/org/openmrs/module/labonfhir/LabOnFhirActivator.java
@@ -27,9 +27,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
 
-@Component
 public class LabOnFhirActivator extends BaseModuleActivator implements ApplicationContextAware, DaemonTokenAware {
 	
 	private static final Logger log = LoggerFactory.getLogger(LabOnFhirActivator.class);
diff --git a/api/src/main/java/org/openmrs/module/labonfhir/LabOnFhirConfig.java b/api/src/main/java/org/openmrs/module/labonfhir/LabOnFhirConfig.java
index cc505fe..b68a98a 100644
--- a/api/src/main/java/org/openmrs/module/labonfhir/LabOnFhirConfig.java
+++ b/api/src/main/java/org/openmrs/module/labonfhir/LabOnFhirConfig.java
@@ -28,9 +28,8 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
 
-@Component
+
 @Configuration
 public class LabOnFhirConfig implements ApplicationContextAware {
 
diff --git a/api/src/main/java/org/openmrs/module/labonfhir/api/LabOrderHandler.java b/api/src/main/java/org/openmrs/module/labonfhir/api/LabOrderHandler.java
index cfbd8a2..a2ca485 100644
--- a/api/src/main/java/org/openmrs/module/labonfhir/api/LabOrderHandler.java
+++ b/api/src/main/java/org/openmrs/module/labonfhir/api/LabOrderHandler.java
@@ -27,9 +27,8 @@
 import org.openmrs.module.labonfhir.LabOnFhirConfig;
 import org.openmrs.module.labonfhir.api.fhir.OrderCreationException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
-@Component
+
 public class LabOrderHandler {
 
 	@Autowired
diff --git a/api/src/main/java/org/openmrs/module/labonfhir/api/LabOrderManager.java b/api/src/main/java/org/openmrs/module/labonfhir/api/LabOrderManager.java
index ea94b03..442bd10 100644
--- a/api/src/main/java/org/openmrs/module/labonfhir/api/LabOrderManager.java
+++ b/api/src/main/java/org/openmrs/module/labonfhir/api/LabOrderManager.java
@@ -15,9 +15,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
-@Component
 public class LabOrderManager implements GlobalPropertyListener {
 
 	private static final Logger log = LoggerFactory.getLogger(LabOrderManager.class);
diff --git a/api/src/main/java/org/openmrs/module/labonfhir/api/event/EncounterCreationListener.java b/api/src/main/java/org/openmrs/module/labonfhir/api/event/EncounterCreationListener.java
index c45c345..49684a2 100644
--- a/api/src/main/java/org/openmrs/module/labonfhir/api/event/EncounterCreationListener.java
+++ b/api/src/main/java/org/openmrs/module/labonfhir/api/event/EncounterCreationListener.java
@@ -16,7 +16,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-@Component("labEncounterListener")
 public class EncounterCreationListener extends LabCreationListener {
 	private static final Logger log = LoggerFactory.getLogger(OrderCreationListener.class);
 	@Autowired
diff --git a/api/src/main/java/org/openmrs/module/labonfhir/api/event/OrderCreationListener.java b/api/src/main/java/org/openmrs/module/labonfhir/api/event/OrderCreationListener.java
index e5ce142..40b65e8 100644
--- a/api/src/main/java/org/openmrs/module/labonfhir/api/event/OrderCreationListener.java
+++ b/api/src/main/java/org/openmrs/module/labonfhir/api/event/OrderCreationListener.java
@@ -15,9 +15,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
-@Component("labOrderListener")
 public class OrderCreationListener extends LabCreationListener {
 	
 	private static final Logger log = LoggerFactory.getLogger(OrderCreationListener.class);
diff --git a/api/src/main/java/org/openmrs/module/labonfhir/api/scheduler/FetchTaskUpdates.java b/api/src/main/java/org/openmrs/module/labonfhir/api/scheduler/FetchTaskUpdates.java
index dcd14b4..2a46295 100644
--- a/api/src/main/java/org/openmrs/module/labonfhir/api/scheduler/FetchTaskUpdates.java
+++ b/api/src/main/java/org/openmrs/module/labonfhir/api/scheduler/FetchTaskUpdates.java
@@ -49,7 +49,6 @@
 
 import java.text.SimpleDateFormat;
 
-@Component
 @Setter(AccessLevel.PACKAGE)
 public class FetchTaskUpdates extends AbstractTask implements ApplicationContextAware {
 
diff --git a/api/src/main/java/org/openmrs/module/labonfhir/api/scheduler/RetryFailedTasks.java b/api/src/main/java/org/openmrs/module/labonfhir/api/scheduler/RetryFailedTasks.java
index ce910c7..627e76a 100644
--- a/api/src/main/java/org/openmrs/module/labonfhir/api/scheduler/RetryFailedTasks.java
+++ b/api/src/main/java/org/openmrs/module/labonfhir/api/scheduler/RetryFailedTasks.java
@@ -16,12 +16,9 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.rest.client.api.IGenericClient;
 
-@Component
 public class RetryFailedTasks extends AbstractTask implements ApplicationContextAware {
     private static Log log = LogFactory.getLog(RetryFailedTasks.class);
 
diff --git a/api/src/main/resources/moduleApplicationContext.xml b/api/src/main/resources/moduleApplicationContext.xml
index f7a0e78..82240bc 100644
--- a/api/src/main/resources/moduleApplicationContext.xml
+++ b/api/src/main/resources/moduleApplicationContext.xml
@@ -10,8 +10,15 @@
   		    http://www.springframework.org/schema/context
   		    http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
-    <context:component-scan base-package="org.openmrs.module.labonfhir"/>
-
+    <bean id="labEncounterListener" class="org.openmrs.module.labonfhir.api.event.EncounterCreationListener"></bean>
+    <bean id="labOrderListener" class="org.openmrs.module.labonfhir.api.event.OrderCreationListener"></bean>
+    <bean id="labOnFhirActivator" class="org.openmrs.module.labonfhir.LabOnFhirActivator"></bean>
+    <bean id="fetchTaskUpdates" class="org.openmrs.module.labonfhir.api.scheduler.FetchTaskUpdates"></bean>
+    <bean id="retryFailedTasks" class="org.openmrs.module.labonfhir.api.scheduler.RetryFailedTasks"></bean>
+    <bean id ="labOrderManager" class="org.openmrs.module.labonfhir.api.LabOrderManager"></bean>
+    <bean id="labOrderHandler" class="org.openmrs.module.labonfhir.api.LabOrderHandler"></bean>
+    <bean id="labOnFhirConfig" class="org.openmrs.module.labonfhir.LabOnFhirConfig"></bean>
+          
     <bean parent="openmrsEventListeners">
         <property name="globalPropertyListeners">
             <list merge="true">