Changed index to check for Type name in the split string.