Add preliminary support for in-band registration