Change to new b2b models