Added the wpf part