Remove direct access to connection const