diff --git a/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JMXRemotingConnectionProvider.java b/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JMXRemotingConnectionProvider.java
index 3e848b5..6627777 100644
--- a/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JMXRemotingConnectionProvider.java
+++ b/src/ems-impl/org/mc4j/ems/impl/jmx/connection/support/providers/JMXRemotingConnectionProvider.java
@@ -76,7 +76,7 @@ protected void doConnect() {
             // Create an RMI connector client
             JMXServiceURL url = new JMXServiceURL(this.connectionSettings.getServerUrl());
 
-            Hashtable env = new Hashtable();
+            Hashtable<String, Object> env = new Hashtable<String, Object>();
 
             if ((connectionSettings.getInitialContextName() != null) &&
                 (connectionSettings.getInitialContextName().trim().length() > 0)) {
@@ -120,8 +120,7 @@ protected void doConnect() {
                 Set<Map.Entry<Object,Object>> entries = connectionSettings.getAdvancedProperties().entrySet();
                 for (Map.Entry entry : entries) {
                     String key = (String) entry.getKey();
-                    String value = (String) entry.getValue();
-
+                    Object value = entry.getValue();
                     env.put(key, value);
                 }
             }