Addedd support for string-ified numbers