Added format for 2 data fields