Sketch of an enhanced Registry type.
Fix Registry to work with the new Registry type
Merge branch 'topic/tmp/registry' into develop