TBAv2 Support. Resolves #29