Enhancement Support for XTM 2.1 on import