Refactored service, reducing object instantiation on connect.