Added registration support