Refactored Connection