updated datamanager class