Update to use shpec