Changed to use new server-side registry support.

8 files changed