Remove DataChangeListener, use registry