Add provider. Fix calculator