Update to latest spec