Added support for string keys