Updated to properly use new str-index