Update to Tocgen 2.1