added support for b2c and mpr