Updated metric composition rules