2 files changed, 5 insertions, 9 deletions

diff --git a/src/net/pacien/util/IntrinsicMap.java b/src/net/pacien/util/IntrinsicMap.java
index fe59ac2..c09965d 100644
--- a/src/net/pacien/util/IntrinsicMap.java
+++ b/src/net/pacien/util/IntrinsicMap.java
@@ -1,6 +1,3 @@
-/**
- * 
- */
 package net.pacien.util;
 
 import java.util.Collection;
@@ -11,12 +8,12 @@ import java.util.Map;
  * @author pacien
  * 
  */
-public class IntrinsicMap<K, V extends Mappable> extends HashMap<K, V> {
+public class IntrinsicMap<K, V extends Mappable<K>> extends HashMap<K, V> {
 
         /**
          * 
          */
-        private static final long serialVersionUID = 1L;
+        private static final long serialVersionUID = 804991277001317260L;
 
         /**
          * 
@@ -47,9 +44,8 @@ public class IntrinsicMap<K, V extends Mappable> extends HashMap<K, V> {
                 super(initialCapacity, loadFactor);
         }
 
-        @SuppressWarnings("unchecked")
         public V put(final V value) {
-                return super.put((K) value.getKey(), value);
+                return super.put(value.getKey(), value);
         }
 
         @Override
diff --git a/src/net/pacien/util/Mappable.java b/src/net/pacien/util/Mappable.java
index b5bbf06..804a275 100644
--- a/src/net/pacien/util/Mappable.java
+++ b/src/net/pacien/util/Mappable.java
@@ -1,7 +1,7 @@
 package net.pacien.util;
 
-public interface Mappable {
+public interface Mappable<K> {
 
-        public Object getKey();
+        public K getKey();
 
 }