Better type registration handling.