Update for new spec