Updated for use with both the web console and server