Switched to ISOExtString and fixed merge errors