Update HashMap to new entry API (RFC 509)