diff --git a/omod/src/main/java/org/openmrs/module/emrapi/web/controller/ActiveVisitController.java b/omod/src/main/java/org/openmrs/module/emrapi/web/controller/ActiveVisitController.java
index 74503e6a..baff683e 100644
--- a/omod/src/main/java/org/openmrs/module/emrapi/web/controller/ActiveVisitController.java
+++ b/omod/src/main/java/org/openmrs/module/emrapi/web/controller/ActiveVisitController.java
@@ -21,7 +21,7 @@
  * (Currently only supports "ensureActiveVisit")
  */
 @Controller
-@RequestMapping(value = "/rest/emrapi/activevisit")
+@RequestMapping(value = "/rest/**/emrapi/activevisit")
 public class ActiveVisitController extends BaseRestController {
 
     @Autowired
diff --git a/omod/src/main/java/org/openmrs/module/emrapi/web/controller/DiagnosisController.java b/omod/src/main/java/org/openmrs/module/emrapi/web/controller/DiagnosisController.java
index 867ae073..5645e7f9 100644
--- a/omod/src/main/java/org/openmrs/module/emrapi/web/controller/DiagnosisController.java
+++ b/omod/src/main/java/org/openmrs/module/emrapi/web/controller/DiagnosisController.java
@@ -15,7 +15,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
-@RequestMapping(value = "/rest/emrapi")
+@RequestMapping(value = "/rest/**/emrapi")
 public class DiagnosisController extends BaseRestController {
 
 	@Autowired
diff --git a/omod/src/main/java/org/openmrs/module/emrapi/web/controller/EmrApiConfigurationController.java b/omod/src/main/java/org/openmrs/module/emrapi/web/controller/EmrApiConfigurationController.java
index df8de93d..a2bd5b11 100644
--- a/omod/src/main/java/org/openmrs/module/emrapi/web/controller/EmrApiConfigurationController.java
+++ b/omod/src/main/java/org/openmrs/module/emrapi/web/controller/EmrApiConfigurationController.java
@@ -16,7 +16,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 @Controller
-@RequestMapping(value = "/rest/emrapi/configuration")
+@RequestMapping(value = "/rest/**/emrapi/configuration")
 public class EmrApiConfigurationController {
 
     @Autowired
diff --git a/omod/src/main/java/org/openmrs/module/emrapi/web/controller/EmrConceptSearchController.java b/omod/src/main/java/org/openmrs/module/emrapi/web/controller/EmrConceptSearchController.java
index c4181648..93f22f25 100644
--- a/omod/src/main/java/org/openmrs/module/emrapi/web/controller/EmrConceptSearchController.java
+++ b/omod/src/main/java/org/openmrs/module/emrapi/web/controller/EmrConceptSearchController.java
@@ -43,7 +43,7 @@
 import static org.springframework.web.bind.annotation.ValueConstants.DEFAULT_NONE;
 
 @Controller
-@RequestMapping(method = RequestMethod.GET, value = "/rest/emrapi/concept")
+@RequestMapping(method = RequestMethod.GET, value = "/rest/**/emrapi/concept")
 public class EmrConceptSearchController {
     @Autowired
     EmrApiProperties emrApiProperties;
diff --git a/omod/src/main/java/org/openmrs/module/emrapi/web/controller/EmrEncounterController.java b/omod/src/main/java/org/openmrs/module/emrapi/web/controller/EmrEncounterController.java
index 5d54ce02..d0d4e13e 100644
--- a/omod/src/main/java/org/openmrs/module/emrapi/web/controller/EmrEncounterController.java
+++ b/omod/src/main/java/org/openmrs/module/emrapi/web/controller/EmrEncounterController.java
@@ -28,7 +28,7 @@
 import java.util.List;
 
 @Controller
-@RequestMapping(value = "/rest/emrapi/encounter")
+@RequestMapping(value = "/rest/**/emrapi/encounter")
 public class EmrEncounterController extends BaseRestController {
 
     @Autowired
diff --git a/omod/src/main/java/org/openmrs/module/emrapi/web/controller/InpatientVisitsController.java b/omod/src/main/java/org/openmrs/module/emrapi/web/controller/InpatientVisitsController.java
index ddc1b381..5b5b333f 100644
--- a/omod/src/main/java/org/openmrs/module/emrapi/web/controller/InpatientVisitsController.java
+++ b/omod/src/main/java/org/openmrs/module/emrapi/web/controller/InpatientVisitsController.java
@@ -19,7 +19,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
-@RequestMapping(value = "/rest/emrapi/inpatient")
+@RequestMapping(value = "/rest/**/emrapi/inpatient")
 public class InpatientVisitsController {
 
     @Autowired