Reorganizing data functions.