Revise entity registration system
Merge pull request #2 from DSH105/master

Revise entity registration system