Started implementing timeout mechanism