diff --git a/src/main/java/com/amihaiemil/charles/aws/AbstractSystemProperty.java b/src/main/java/com/amihaiemil/charles/aws/AbstractSystemProperty.java
index 7bff77e..0b54501 100644
--- a/src/main/java/com/amihaiemil/charles/aws/AbstractSystemProperty.java
+++ b/src/main/java/com/amihaiemil/charles/aws/AbstractSystemProperty.java
@@ -32,7 +32,7 @@
  * @version $Id$
  * @since 1.0.0 
  * @todo #201:15m/DEV Add fake implementation for the 4 SystemProperty
- * interfaces to use them in testing.
+ *  interfaces to use them in testing.
  */
 abstract class AbstractSystemProperty implements SystemProperty {
 
@@ -49,7 +49,7 @@ public AbstractSystemProperty(String name) {
         this.name = name;
     }
 
-	@Override
+    @Override
     public String read() {
         return System.getProperty(this.name);
     }
diff --git a/src/main/java/com/amihaiemil/charles/aws/StAccessKeyId.java b/src/main/java/com/amihaiemil/charles/aws/StAccessKeyId.java
index a1e5d5a..8a0db35 100644
--- a/src/main/java/com/amihaiemil/charles/aws/StAccessKeyId.java
+++ b/src/main/java/com/amihaiemil/charles/aws/StAccessKeyId.java
@@ -31,7 +31,7 @@
  * @version $Id$
  * @since 1.0.0
  */
-public final class StAccessKeyId extends AbstractSystemProperty implements SecretKey {
+public final class StAccessKeyId extends AbstractSystemProperty implements AccessKeyId {
     
     /**
      * Ctor. 
diff --git a/src/main/java/com/amihaiemil/charles/aws/StEsEndPoint.java b/src/main/java/com/amihaiemil/charles/aws/StEsEndPoint.java
index 0c75a2c..1fff72d 100644
--- a/src/main/java/com/amihaiemil/charles/aws/StEsEndPoint.java
+++ b/src/main/java/com/amihaiemil/charles/aws/StEsEndPoint.java
@@ -40,5 +40,13 @@ public final class StEsEndPoint extends AbstractSystemProperty implements EsEndP
     public StEsEndPoint(final String name) {
         super(name);
     }
-
+ 
+    @Override
+    public String read() {
+        String endPoint = super.read();
+        if(!endPoint.endsWith("\\")) {
+            endPoint += "\\";
+        }
+        return endPoint;
+    }
 }
diff --git a/src/main/java/com/amihaiemil/charles/aws/StRegion.java b/src/main/java/com/amihaiemil/charles/aws/StRegion.java
index 8261396..296c05d 100644
--- a/src/main/java/com/amihaiemil/charles/aws/StRegion.java
+++ b/src/main/java/com/amihaiemil/charles/aws/StRegion.java
@@ -31,7 +31,7 @@
  * @version $Id$
  * @since 1.0.0
  */
-public final class StRegion extends AbstractSystemProperty implements SecretKey {
+public final class StRegion extends AbstractSystemProperty implements Region {
     
     /**
      * Ctor.