More format updates