Update ConnectionManager to work with UTF-8