Updated the formats to new Standard/Extended.