Add support for numeric keys