WIP version of fixing IANA tables - moved to latest Ali's proposal