data-manager refactor
merge with data manager refactor