Added ConnectionManager