diff --git a/api/src/main/java/org/openmrs/module/rulesengine/domain/Dose.java b/api/src/main/java/org/openmrs/module/rulesengine/domain/Dose.java
index 4745b2d..60fe825 100644
--- a/api/src/main/java/org/openmrs/module/rulesengine/domain/Dose.java
+++ b/api/src/main/java/org/openmrs/module/rulesengine/domain/Dose.java
@@ -20,7 +20,9 @@ public DoseUnit getDoseUnit() {
     }
 
     public enum DoseUnit {
-        mg
+        mg,
+        mcg,
+        ml
     }
 
     public String getDrugName() {
diff --git a/api/src/main/java/org/openmrs/module/rulesengine/engine/RulesEngineImpl.java b/api/src/main/java/org/openmrs/module/rulesengine/engine/RulesEngineImpl.java
index 48ffa46..392603f 100644
--- a/api/src/main/java/org/openmrs/module/rulesengine/engine/RulesEngineImpl.java
+++ b/api/src/main/java/org/openmrs/module/rulesengine/engine/RulesEngineImpl.java
@@ -86,7 +86,7 @@ private List<DosageRule> getExtendedRules() {
     }
 
     private File[] getExtendedRuleFiles() {
-        File folder = new File(getRulesEngineExtensionPath());
+        File folder = new File(OpenmrsUtil.getApplicationDataDirectory(), getRulesEngineExtensionPath());
         File[] listOfFiles = folder.listFiles(new FilenameFilter() {
             public boolean accept(File dir, String filename) {
                 return filename.endsWith(".groovy");
@@ -96,8 +96,7 @@ public boolean accept(File dir, String filename) {
     }
 
     private String getRulesEngineExtensionPath() {
-        String ruleFilePath = OpenmrsUtil.getApplicationDataDirectory() +
-                "bahmni_config" + File.separator + "openmrs" + File.separator +
+        String ruleFilePath =  "bahmni_config" + File.separator + "openmrs" + File.separator +
                 rulesEngineExtensionPath;
         return ruleFilePath;
     }