Entities now mirror correctly