MMSBUILD-258 (Mark) Refactor and extend registry support

@markbenvenuto