Reworked providers