I agree with the first point, but I think the second point is a bit overkill...won't we have `providers` soon as well?