Made Gateway persistent for app lifetime.