Added WPF