Change EntityObserver to Observer