[TASK] Simplify connection setup