[EXPORT] Add formatter changes to be compliant with sired format