refactored
Data frame adapter
refactor - reduce interdependency among modules