Working on a new branch named hotfix
remove dstore
Add more file