Adding code for windows client