changed Entry from array to map.