Small changes to enable adding of new providers