Updates to ConnectionManager class