Updated DTOs to map collective fields to key value pairs, as well as unmap them when used in transmission. Fixes #37353