Implement connection contexts properly(?)