Increased timeout limit to 30sec