Rework to use normal url form on windows platform