Update toughness measurement to the new style
Update branch architecture to new style