Updated resource provider implementation