Refactor octopus to correctly handle new Enclave dsu building implementations