refactor(dccd): Simplify both the interface and the implementation

#909 cont'd. This commit is for the map changes (909 is for collection).

Closes #935