Connection manager added #35