Some more entity updates