Registry redesignned