Added XSI Plugin & changed comments