Added support for windows environment