Use new shpec syntax