Merge Pricing into refactoring