Issue #198: Implement proper Timeout Mechanism