Add T4 support