Various key value mapping modifications