Move the ConnectionManager to services