1. Continous work on removing T4Include dependency