Refactoring
Ported to .Net 2.0 provider.
Ported to .Net 4.5 provider.