Refactoring server timeout support