Wired in EntityDeletedFactory and changed implementations to support using the factory.