Added support for numeric keys