More entity updates