Refactoring and support for slow connection