Refactor ODTPFramwork