Added basic registration support