CPQuantities: structural changes in calculation