Hashmap stuff added