Minor updates to data_management
Minor updates