Updated version including new WPF API items