Refactored. Added support of new providers in schema.