Added registration support (not done yet).