Make work on new toolserver