Fixes #94
Empty data allowed to add to DC
Fixes #91
Fixes #93
Fixes #89