Tiny update to Datamanager