Build edts simpler