added support for long lived connections