Add ten second timeout and retry