Added mP to DimVar and updated UC expansion