Code updated for windows client
Added for windows client support