Added support for non-string names.