Additions to make ttv2izer more generic