Providers now as a dule
refactoring