updated ConnectionManager