Client Tool API mods