Adding more LTI2 support