MySQL data file refactored