refactor

Pricing model changes (Task #73569)