Modifications for WPF implementation