Changing to use unmanaged ids everywhere possible