Format and delimiter annotations enhancement - same as for Transformer