Added ID and Dom0/U check