Upgraded to new version of System.Specs