Kendo Intergration & Diamond Fix