Patching gateway

SD-65 : implement session expiration

Patching and adding gateway.