Upgraded to the latest version of System.Spec