MINOR CHANGE: Data Provider refactored