I'd like to keep it separated, so the addition of new weighting functions does not clutter the Base provider.

But if you insist I can update that.