Change ConnectionManager API