Move pricing into Pricing model