Updated handle the new provider infrastructure