Added correct keys and values