Refactored Data Module