refactorized some more providers