WIP: Deal with type registration