Updated to work on Windows Servers