Update for Winodws 7 support