NR-610 : Complete the security gateway

Several improvements and service gateway implementation.