Add support for non-string type values
Add support for non-string type values