Refactor to improve discoverability of DEA NATS messages