Add DataManager
merge