Rework of Providers class. Should be finished soon