Update ServiceEndpoint
to support sets and maps
#485
Merged
ServiceEndpoint
to support sets and maps
#485