rework target handling - restart dataserver - removal of datastore in dataserver - watch handler - ...
