Use the new style system