Updated System.Spec