Improvde performace for windows build.
Started adding ranged support.