Updated provider code a bit.