Removing EntityInfo dependency on Entity