Update to latest Tocgen