NR-610 : Complete the security gateway

Added also authentificated gateways.