Adding more cases to the connection manager