Updated structs to allow for advanced bitpacking