Updated for Entity Read.