Added Clip & DataTemplateSelector