Data Module refactored