Change the API to use map[string][]string