Adjust CLI to work with rejiggered table writer