Registry server: More work to be compatible