Providers refactoring
Merge pull request #484 from ognevsky/refactor-providers

Burn and resurrection of external providers