Updating diamond format for HashMap init