Added support for entities without keys.