Refactored fs resource provider