Corrected design problem with the ConnectionManager. Old methods are marked as deprecated.