DID and Gateway field changes (V1.7.3 beta)