Added Additional timeout mechanism