Removed duplication from Connection methods