Mods for the tool handler plugin