Changed minor stuff in order to check Hashmap creation