Added Windows capability