Updates to pack/unpack methods.