Replace providers by services