Datamanager changes