Upgrade messageformat and match generated formats