Updated to support string version publicly