Entity improvements