Update to account for binary format changes