More features in WPF