Updated datamanager