More ConnectionManager improvements