Update class for Win 8