Refactoring timeout configuration