Update format to support 2.6