Changing some types in output to match new key class of input