Added support for removed entity states.