Updated dataManager for #34