Update to use Cstring instead of TCHAR[]