Add recovery for data stores and propogate ids to tools