Use DataRegistry
Merge branch 'master' of github.com:tyteen4a03/3ps_cmfu