diff --git a/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeAttributeTypeDaoImpl.java b/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeAttributeTypeDaoImpl.java
index aa8d3be..83a5790 100644
--- a/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeAttributeTypeDaoImpl.java
+++ b/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeAttributeTypeDaoImpl.java
@@ -9,7 +9,6 @@
 
 import java.util.List;
 
-@Repository
 public class EpisodeAttributeTypeDaoImpl implements EpisodeAttributeTypeDao {
 
     private static final String HQL_SELECT_ALL_EPISODE_ATTRIBUTE_TYPE = "FROM EpisodeAttributeType";
diff --git a/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeDAOImpl.java b/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeDAOImpl.java
index 4008e53..60df014 100644
--- a/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeDAOImpl.java
+++ b/api/src/main/java/org/openmrs/module/episodes/dao/impl/EpisodeDAOImpl.java
@@ -11,12 +11,14 @@
 
 import java.util.List;
 
-@Repository
 public class EpisodeDAOImpl implements EpisodeDAO {
 
-    @Autowired
     private SessionFactory sessionFactory;
 
+    public EpisodeDAOImpl(SessionFactory sessionFactory) {
+        this.sessionFactory = sessionFactory;
+    }
+
     @Override
     public void save(Episode episode) {
         session().save(episode);
diff --git a/api/src/main/java/org/openmrs/module/episodes/service/EpisodeAttributeTypeService.java b/api/src/main/java/org/openmrs/module/episodes/service/EpisodeAttributeTypeService.java
index 846a8a3..c6895d2 100644
--- a/api/src/main/java/org/openmrs/module/episodes/service/EpisodeAttributeTypeService.java
+++ b/api/src/main/java/org/openmrs/module/episodes/service/EpisodeAttributeTypeService.java
@@ -1,6 +1,5 @@
 package org.openmrs.module.episodes.service;
 
-import org.openmrs.ConceptAttributeType;
 import org.openmrs.annotation.Authorized;
 import org.openmrs.module.episodes.EpisodeAttributeType;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeAttributeTypeServiceImpl.java b/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeAttributeTypeServiceImpl.java
index c282e95..bfb61ec 100644
--- a/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeAttributeTypeServiceImpl.java
+++ b/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeAttributeTypeServiceImpl.java
@@ -11,7 +11,6 @@
 import java.util.Date;
 import java.util.List;
 
-@Service
 @Transactional
 public class EpisodeAttributeTypeServiceImpl implements EpisodeAttributeTypeService {
 
diff --git a/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeServiceImpl.java b/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeServiceImpl.java
index 6e3b13f..bb21361 100644
--- a/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeServiceImpl.java
+++ b/api/src/main/java/org/openmrs/module/episodes/service/impl/EpisodeServiceImpl.java
@@ -11,12 +11,15 @@
 
 import java.util.List;
 
-@Component
 @Transactional
 public class EpisodeServiceImpl implements EpisodeService {
-    @Autowired
+
     private EpisodeDAO episodeDAO;
 
+    public EpisodeServiceImpl(EpisodeDAO episodeDAO) {
+        this.episodeDAO = episodeDAO;
+    }
+
     @Override
     public void save(Episode episode) {
         episodeDAO.save(episode);
diff --git a/api/src/main/resources/moduleApplicationContext.xml b/api/src/main/resources/moduleApplicationContext.xml
index a542b35..28d0f07 100644
--- a/api/src/main/resources/moduleApplicationContext.xml
+++ b/api/src/main/resources/moduleApplicationContext.xml
@@ -23,6 +23,65 @@
   		    http://www.springframework.org/schema/util
   		    http://www.springframework.org/schema/util/spring-util-3.0.xsd">
 
-	<context:component-scan base-package="org.openmrs.module.episodes"/>
+	<bean id="episodeDao" class="org.openmrs.module.episodes.dao.impl.EpisodeDAOImpl">
+		<constructor-arg name="sessionFactory"  ref="sessionFactory"/>
+	</bean>
+	<bean id="episodeAttributeTypeDao" class="org.openmrs.module.episodes.dao.impl.EpisodeAttributeTypeDaoImpl">
+		<constructor-arg name="sessionFactory"  ref="sessionFactory"/>
+	</bean>
+
+	<bean id="episodeService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager">
+			<ref bean="transactionManager"/>
+		</property>
+		<property name="target">
+			<bean class="org.openmrs.module.episodes.service.impl.EpisodeServiceImpl">
+				<constructor-arg name="episodeDAO" ref="episodeDao"/>
+			</bean>
+		</property>
+		<property name="preInterceptors">
+			<ref bean="serviceInterceptors"/>
+		</property>
+		<property name="transactionAttributeSource">
+			<ref bean="transactionAttributeSource"/>
+		</property>
+	</bean>
+
+	<bean id="episodeAttributeTypeService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager">
+			<ref bean="transactionManager"/>
+		</property>
+		<property name="target">
+			<bean class="org.openmrs.module.episodes.service.impl.EpisodeAttributeTypeServiceImpl">
+				<constructor-arg name="episodeAttributeTypeDao" ref="episodeAttributeTypeDao"/>
+			</bean>
+		</property>
+		<property name="preInterceptors">
+			<ref bean="serviceInterceptors"/>
+		</property>
+		<property name="transactionAttributeSource">
+			<ref bean="transactionAttributeSource"/>
+		</property>
+	</bean>
+
+	<bean parent="serviceContext">
+		<property name="moduleService">
+			<list merge="true">
+				<value>org.openmrs.module.episodes.service.EpisodeService</value>
+				<ref bean="episodeService"/>
+			</list>
+		</property>
+	</bean>
+
+	<bean parent="serviceContext">
+		<property name="moduleService">
+			<list merge="true">
+				<value>org.openmrs.module.episodes.service.EpisodeAttributeTypeService</value>
+				<ref bean="episodeAttributeTypeService"/>
+			</list>
+		</property>
+	</bean>
+
+
 
 </beans>