Added support for Map<KeyType, T> where KeyType can be not only a String but also any subtype of java.lang.Number and java.lang.CharSequence