Add support for Multi-PV Margin