changed storage format to be consistent with companion-roots