WIP of -03 version with some IANA tables