Switched to HashMap<String,Value>