Updates to support windows client