EntityInfo fixed to compatabile with new version of code