Add menu completion for windows