Update service for data
Merge branch 'develop' of https://github.com/trantrungdng/dmb into develop