Changed to 128 bit serial number and parameterised type lengths