Last changes for Gateway : InjectionDate and ThreadID