updated key names to conform