data cfg refactoring finished