WIP
Migrated the URI data types.