Update to latest spec format