Update to new spec