Safe-Connections 2.0