Name changes, added other hashmap