Add support for string keys in convert