Add support for new registration and identification method.

I made a few small changes to adapt to the new requirements.