Refactor/bundle save with only facility uuids