Addressed timeout issues