IANA - Added more tables (WIP)