Add etv2 support for etv script