added support for arbitrary non-string properties