Support the new bool format parameter and reduce file size