Fixing Localprovider support